diff -urN smeserver-unjunkmgr-2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/unjunkmgr smeserver-unjunkmgr-2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/unjunkmgr --- smeserver-unjunkmgr-2.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/unjunkmgr 2008-08-28 08:31:31.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/unjunkmgr 2020-11-17 19:30:42.415080810 +0000 @@ -30,9 +30,19 @@ $OUT .= "Alias /unjunkmgr /usr/local/unjunkmgr\n"; $OUT .= "\n"; - $OUT .= "\tAddType application/x-httpd-php .php\n"; - $OUT .= "\tOptions FollowSymLinks\n"; - $OUT .= "\tOptions +ExecCGI\n"; + + #$OUT .= "\tAddType application/x-httpd-php .php\n"; + #$OUT .= "\tOptions FollowSymLinks\n"; + #$OUT .= "\tOptions +ExecCGI\n"; + + $OUT .= "\tOptions +FollowSymLinks\n"; + $OUT .= "\tAllowOverride All\n"; + $OUT .= "\t\n"; + $OUT .= "\t\torder deny,allow\n"; + $OUT .= "\t\tSetHandler \"proxy:unix:/var/run/php-fpm/php74.sock|fcgi://localhost\"\n"; + $OUT .= "\t\n"; + + $OUT .= "\torder deny,allow\n"; $OUT .= "\tdeny from all\n"; diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/barcode_image.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/barcode_image.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/barcode_image.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/barcode_image.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,75 @@ + 5 ) { + echo "

Module width must be between 1 and 5 pixels

"; +} +elseif( $data==="" ) { + echo "

Please enter data to be encoded, select symbology and press 'Ok'.

"; + echo "Note: Data must be valid for the choosen encoding."; +} +elseif( $code==-1 ) { + echo "

No code symbology selected.

"; +} +elseif( $height < 10 || $height > 500 ) { + echo "

Height must be in range [10, 500]

"; +} +elseif( $scale < 0.1 || $scale > 15 ) { + echo "

Scale must be in range [0.1, 15]

"; +} +else { + if( $code==20 ) { + $encoder = BarcodeFactory::Create(6); + $encoder->UseExtended(); + } + else { + $encoder = BarcodeFactory::Create($code); + } + $b = $backend=='EPS' ? 'PS' : $backend; + $b = substr($backend,0,5) == 'IMAGE' ? 'IMAGE' : $b; + $e = BackendFactory::Create($b,$encoder); + if( substr($backend,0,5) == 'IMAGE' ) { + if( substr($backend,5,1) == 'J' ) + $e->SetImgFormat('JPEG'); + } + if( $e ) { + if( $backend == 'EPS' ) + $e->SetEPS(); + if( $pswidth!='' ) + $modwidth = $pswidth; + $e->SetModuleWidth($modwidth); + $e->AddChecksum($checksum); + $e->NoText($notext); + $e->SetScale($scale); + $e->SetVertical($vertical); + $e->ShowFrame($showframe); + $e->SetHeight($height); + $r = $e->Stroke($data,$file,$info,$info); + if( $r ) + echo nl2br(htmlspecialchars($r)); + if( $file != '' ) + echo "

Wrote file $file."; + } + else + echo "

Can't create choosen backend: $backend.

"; +} + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/barcode_menu.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/barcode_menu.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/barcode_menu.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/barcode_menu.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,125 @@ +

JpGraph Barcode 1.0

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Data:
+ +
+Encoding:
+ +
+Module width:
+ +
+Add checksum:
+ +
+Hide text:
+ +
+Show frame:
+ +
+Vertical layout:
+ +
+Height:
+ +
+Scale:
+ +
+Write to file:
+ +
+Format:
+ +
+PS module width: + +
+
+(If specified will override Module width above)
+
+Debug info:
+ +
+
+ +
+
+ +

+


+ + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/index.html smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/index.html --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/index.html 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/demoapp/index.html 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,10 @@ + + + +Barcode SYSTEMTEST + + +; + + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_errhandling_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_errhandling_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_errhandling_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_errhandling_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,16 @@ +Stroke('abc123'); +} catch( JpGraphException $e ) { + //echo 'Error: ' . $e->getMessage()."\n"; + JpGraphError::Raise($e->getMessage()); +} + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,11 @@ +Stroke('ABC123'); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,14 @@ +SetModuleWidth(2); +$e->SetHeight(20); +echo nl2br($e->Stroke('3125134772')); + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,14 @@ +SetModuleWidth(2); +$e->SetHeight(70); +$ps = $e->Stroke('3125134772'); +echo nl2br(htmlspecialchars($ps)); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,17 @@ +"; +$encoder = BarcodeFactory::Create(ENCODING_CODEI25); +$e = BackendFactory::Create(BACKEND_PS,$encoder); +$e->SetModuleWidth(2); +$e->SetHeight(70); +$e->SetEPS(); +$ps = $e->Stroke('3125134772'); +echo nl2br(htmlspecialchars($ps)); + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_ex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +SetModuleWidth(2); +$e->Stroke('1234'); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_usps_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_usps_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_usps_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/examples/barcode_usps_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,74 @@ +_USPS_chkd(substr($data,8)); + $data = '420'. $aZIP . '~191' . $aServiceType . $aDUNS . $aSeqNbr; + return $data . $cd; + } + + // Get type 2 of confirmation code (without ZIP) + function GetPIC($aServiceType,$aDUNS,$aSeqNbr) { + // Convert to USPS format with AI=91 + $data = '91' . $aServiceType . $aDUNS . $aSeqNbr; + $cd = $this->_USPS_chkd($data); + return $data . $cd; + } + +} + +$usps = new USPS_Confirmation(); +$zip = '92663'; +$service = '21'; +$DUNS = '805213907'; +$seqnr = '04508735'; +$data = $usps->GetPICwithZIP($zip,$service,$DUNS,$seqnr); +//$data = $usps->GetPIC('01','123456789','00000001'); + +$encoder = BarcodeFactory::Create(ENCODING_EAN128); +$e = BackendFactory::Create(BACKEND_IMAGE,$encoder); +$e->SetModuleWidth(2); +$e->SetFont(FF_ARIAL,FS_NORMAL,14); +$e->Stroke($data); + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/mkbarcode.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/mkbarcode.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/barcode/mkbarcode.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/barcode/mkbarcode.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,281 @@ +argv = ($_SERVER['argv']); + $this->argc = ($_SERVER['argc']); + } + + function PrintUsage() { + $n = $this->argv[0]; + echo "$n -b [-r -h -c -o -m -s -y -f ] datastring \n". + "Create the specified barcode\n". + "-b What symbology to use, one of the following strings (case insensitive)\n". + " UPCA \n". + " UPCE \n". + " EAN128 \n". + " EAN13 \n". + " EAN8 \n". + " CODE11 \n". + " CODE39 \n". + " CODE128 \n". + " CODE25 \n". + " CODEI25 \n". + " CODABAR \n". + " BOOKLAND \n". + "-c Add checkdigit for symbologies where this is optional\n". + "-o Output format. 0=Image, 1=PS, 2=EPS\n". + "-m Module width\n". + "-s Scale factor\n". + "-h Show this help\n". + "-f Filename to write to\n". + "-r Rotate barcode 90 degrees\n". + "-y height Set height in pixels\n". + "-x Hide the human readable text\n". + "--silent Silent. Don't give any error mesages\n"; + exit(1); + } + + function Get() { + $barcode='code39'; + $hide=false; + $checkdigit=false; + $modulewidth=2; + $scale=1; + $output=0; + $filename=''; + $data = ''; + $rotate = false; + $silent=false; + $height = 70; + if( ($n=$this->GetNum()) > 0 ) { + $i=1; + while( $i <= $n ) { + switch( $this->argv[$i] ) { + case '-h': + $this->PrintUsage(); + exit(0); + break; + case '-b': + $barcode = $this->argv[++$i]; + break; + case '-o': + $output = (int)$this->argv[++$i]; + break; + case '-y': + $height = (int)$this->argv[++$i]; + break; + case '-x': + $hide=true; + break; + case '-r': + $rotate=true; + break; + case '-c': + $checkdigit=true; + break; + case '--silent': + $silent=true; + break; + case '-s': + $scale = (float)$this->argv[++$i]; + break; + case '-m': + $modulewidth = (float)$this->argv[++$i]; + break; + case '-f': + $filename = $this->argv[++$i]; + break; + default: + if( $data == '' ) { + $data = $this->argv[$i]; + } + else { + $this->PrintUsage(); + die("Illegal specified parameters"); + } + break; + } + ++$i; + } + + } + + if( $output < 0 || $output > 2 ) { + fwrite(STDERR,"Unkown output format ($output)\n"); + exit(1); + } + + if( $output === 0 ) { + $modulewidth = floor($modulewidth); + } + + // Sanity check + if( $modulewidth > 15 ) { + fwrite(STDERR,"Too large modulewidth\n"); + exit(1); + } + + // Sanity check + if( $height > 1000 ) { + fwrite(STDERR,"Too large height\n"); + exit(1); + } + + // Sanity check + if( $scale > 15 ) { + fwrite(STDERR,"Too large scale factor\n"); + exit(1); + } + + if( strlen($filename) > 256 ) { + fwrite(STDERR,"Too long filename\n"); + exit(1); + } + + if( trim($data) == '' ) { + fwrite(STDERR,"No input data specified\n"); + exit(1); + } + + $barcodes = array( + 'UPCA' => ENCODING_UPCA, + 'UPCE' => ENCODING_UPCE, + 'EAN128' => ENCODING_EAN128, + 'EAN13' => ENCODING_EAN13, + 'EAN8' => ENCODING_EAN8, + 'CODE11' => ENCODING_CODE11, + 'CODE39' => ENCODING_CODE39, + 'CODE128' => ENCODING_CODE128, + 'CODE25' => ENCODING_CODE25, + 'CODEI25' => ENCODING_CODEI25, + 'CODABAR' => ENCODING_CODABAR, + 'BOOKLAND' => ENCODING_BOOKLAND, + ); + $barcode = strtoupper($barcode); + if( key_exists($barcode,$barcodes) ) { + $barcode = $barcodes[$barcode]; + } + else { + fwrite(STDERR,'Specified barcode symbology ('.$barcode.") is not supported\n"); + exit(1); + } + + $ret = array( + 'barcode' => $barcode, + 'hide' => $hide, + 'modulewidth' => $modulewidth, + 'scale' => $scale, + 'output' => $output, + 'data' => $data, + 'silent' => $silent, + 'rotate' => $rotate, + 'height' => $height, + 'checkdigit' => $checkdigit, + 'filename' => $filename + ); + + return $ret; + } + + function _Dump() { + var_dump($this->argv); + } + + function GetNum() { + return $this->argc-1; + } +} + +//---------------------------------------------------------------------- +// CLASS Driver +// Main driver class to create barcodes with the parmeters specified on +// the command line. +//---------------------------------------------------------------------- +class Driver { + + private $iParams; + static public $silent=false; + + static public function ErrHandlerPS(Exception $e) { + if( !Driver::$silent ) + fwrite(STDERR,$e->getMessage()."\n"); + exit(1); + } + + static public function ErrHandlerImg(Exception $e) { + if( !Driver::$silent ) + fwrite(STDERR,$e->getMessage()."\n"); + $errobj = new JpGraphErrObjectImg(); + $errobj->Raise($e->getMessage()); + exit(1); + } + + function Run($aParams) { + + $this->iParams = $aParams; + + Driver::$silent = $aParams['silent']; + + $encoder = BarcodeFactory::Create($aParams['barcode']); + $encoder->AddChecksum($aParams['checkdigit']); + switch( $aParams['output'] ) { + case 0: + $e = BackendFactory::Create(BACKEND_IMAGE,$encoder); + set_exception_handler(array('Driver','ErrHandlerImg')); + break; + case 1: + $e = BackendFactory::Create(BACKEND_PS,$encoder); + set_exception_handler(array('Driver','ErrHandlerPS')); + break; + case 2: + $e = BackendFactory::Create(BACKEND_PS,$encoder); + $e->SetEPS(); + set_exception_handler(array('Driver','ErrHandlerPS')); + break; + } + $e->SetHeight($aParams['height']); + $e->SetVertical($aParams['rotate']); + $e->SetModuleWidth($aParams['modulewidth']); + $e->SetScale($aParams['scale']); + $e->HideText($aParams['hide']); + if( $aParams['output'] === 0 ) { + $err = $e->Stroke($aParams['data'], $aParams['filename']); + } + else { + $s = $e->Stroke($aParams['data'], $aParams['filename']); + if( $aParams['filename'] == '' ) { + // If no filename specified then return the generated postscript + echo $s; + } + } + } +} + +$pa = new ParseArgs(); +$params = $pa->Get(); +$driver = new Driver(); +$driver->Run($params); + +// Successfull termination +exit(0); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/accbarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/accbarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/accbarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/accbarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +cleartheme(); +$graph->SetScale("textlin"); + +$graph->SetShadow(); +$graph->img->SetMargin(40,30,20,40); + +// Create the bar plots +$b1plot = new BarPlot($data1y); +$b1plot->SetFillColor("orange"); +$b1plot->value->Show(); +$b2plot = new BarPlot($data2y); +$b2plot->SetFillColor("blue"); +$b2plot->value->Show(); + +// Create the grouped bar plot +$gbplot = new AccBarPlot(array($b1plot,$b2plot)); + +// ...and add it to the graPH +$graph->Add($gbplot); + +$graph->title->Set("Accumulated bar plots"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,31 @@ +SetScale('textlin'); +$graph->SetMarginColor('white'); + +// Setup title +$graph->title->Set('Acc bar with gradient'); + +// Create the first bar +$bplot = new BarPlot($datay1); +$bplot->SetFillGradient('AntiqueWhite2','AntiqueWhite4:0.8',GRAD_VERT); +$bplot->SetColor('darkred'); + +// Create the second bar +$bplot2 = new BarPlot($datay2); +$bplot2->SetFillGradient('olivedrab1','olivedrab4',GRAD_VERT); +$bplot2->SetColor('darkgreen'); + +// And join them in an accumulated bar +$accbplot = new AccBarPlot(array($bplot,$bplot2)); +$graph->Add($accbplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ +SetScale('textlin'); +$graph->SetMarginColor('white'); + +// Setup title +$graph->title->Set('Acc bar with gradient'); + +// Create the first bar +$bplot = new BarPlot($datay1); +$bplot->SetFillGradient('AntiqueWhite2','AntiqueWhite4:0.8',GRAD_VERT); +$bplot->SetColor('darkred'); + +// Create the second bar +$bplot2 = new BarPlot($datay2); +$bplot2->SetFillGradient('olivedrab1','olivedrab4',GRAD_VERT); +$bplot2->SetColor('darkgreen'); + +// And join them in an accumulated bar +$accbplot = new AccBarPlot(array($bplot,$bplot2)); +$accbplot->SetColor('red'); +$accbplot->SetWeight(1); +$graph->Add($accbplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/accbarframeex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,35 @@ +SetScale('textlin'); +$graph->SetMarginColor('white'); + +// Setup title +$graph->title->Set('Acc bar with gradient'); + +// Create the first bar +$bplot = new BarPlot($datay1); +$bplot->SetFillGradient('AntiqueWhite2','AntiqueWhite4:0.8',GRAD_VERT); +$bplot->SetColor('darkred'); +$bplot->SetWeight(0); + +// Create the second bar +$bplot2 = new BarPlot($datay2); +$bplot2->SetFillGradient('olivedrab1','olivedrab4',GRAD_VERT); +$bplot2->SetColor('darkgreen'); +$bplot2->SetWeight(0); + +// And join them in an accumulated bar +$accbplot = new AccBarPlot(array($bplot,$bplot2)); +$accbplot->SetColor('darkgray'); +$accbplot->SetWeight(1); +$graph->Add($accbplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/alphabarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/alphabarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/alphabarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/alphabarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,75 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->img->SetMargin(40,80,30,40); + +// Adjust the position of the legend box +$graph->legend->Pos(0.02,0.15); + +// Adjust the color for theshadow of the legend +$graph->legend->SetShadow('darkgray@0.5'); +$graph->legend->SetFillColor('lightblue@0.3'); + +// Get localised version of the month names +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +// Set a nice summer (in Stockholm) image +$graph->SetBackgroundImage('stship.jpg',BGIMG_COPY); + +// Set axis titles and fonts +$graph->xaxis->title->Set('Year 2002'); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetColor('white'); + +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->SetColor('white'); + +$graph->yaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->SetColor('white'); + +//$graph->ygrid->Show(false); +$graph->ygrid->SetColor('white@0.5'); + +// Setup graph title +$graph->title->Set('Using alpha blending with a background'); +// Some extra margin (from the top) +$graph->title->SetMargin(3); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12); + +// Create the three var series we will combine +$bplot1 = new BarPlot($datay1); +$bplot2 = new BarPlot($datay2); +$bplot3 = new BarPlot($datay3); + +// Setup the colors with 40% transparency (alpha channel) +$bplot1->SetFillColor('orange@0.4'); +$bplot2->SetFillColor('brown@0.4'); +$bplot3->SetFillColor('darkgreen@0.4'); + +// Setup legends +$bplot1->SetLegend('Label 1'); +$bplot2->SetLegend('Label 2'); +$bplot3->SetLegend('Label 3'); + +// Setup each bar with a shadow of 50% transparency +$bplot1->SetShadow('black@0.4'); +$bplot2->SetShadow('black@0.4'); +$bplot3->SetShadow('black@0.4'); + +$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3)); +$gbarplot->SetWidth(0.6); +$graph->Add($gbarplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/antispamex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/antispamex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/antispamex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/antispamex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,18 @@ +Rand(5); + +// Stroke random cahllenge +if( $spam->Stroke() === false ) { + die('Illegal or no data to plot'); +} + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/aqua_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/aqua_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/aqua_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/aqua_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ + array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ), + 1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ), + 2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ), + 3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ), + 4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ), + 5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ), + 6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ), + 7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ), + 8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ), +); + + +// Create the graph. These two calls are always required +$graph = new Graph(400,300); + +$graph->SetScale("textlin"); +if ($theme) { + $graph->SetTheme(new $theme()); +} +$theme_class = new AquaTheme; +$graph->SetTheme($theme_class); + +$plot = array(); +// Create the bar plots +for ($i = 0; $i < 4; $i++) { + $plot[$i] = new BarPlot($data[$i]); + $plot[$i]->SetLegend('plot'.($i+1)); +} +//$acc1 = new AccBarPlot(array($plot[0], $plot[1])); +//$acc1->value->Show(); +$gbplot = new GroupBarPlot(array($plot[2], $plot[1] )); + +for ($i = 4; $i < 8; $i++) { + $plot[$i] = new LinePlot($data[$i]); + $plot[$i]->SetLegend('plot'.$i); + $plot[$i]->value->Show(); +} + +$graph->Add($gbplot); +$graph->Add($plot[4]); + +$title = "AquaTheme Example"; +$title = mb_convert_encoding($title,'UTF-8'); +$graph->title->Set($title); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,35 @@ +SetScale('intlin'); +$graph->SetMargin(30,15,40,30); +$graph->SetMarginColor('white'); +$graph->SetFrame(true,'blue',3); + +$graph->title->Set('Label background'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10); +$graph->subtitle->SetColor('darkred'); +$graph->subtitle->Set('"LABELBKG_NONE"'); + +$graph->SetAxisLabelBackground(LABELBKG_NONE,'orange','red','lightblue','red'); + +// Use Ariel font +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->xgrid->Show(); + +// Create the plot line +$p1 = new LinePlot($ydata); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +SetScale('intlin'); +$graph->SetMargin(30,15,40,30); +$graph->SetMarginColor('white'); +$graph->SetFrame(true,'blue',3); + +$graph->title->Set('Label background'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10); +$graph->subtitle->SetColor('darkred'); +$graph->subtitle->Set('"LABELBKG_XAXIS"'); + +$graph->SetAxisLabelBackground(LABELBKG_XAXIS,'orange','red','lightblue','red'); + +// Use Ariel font +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->xgrid->Show(); + +// Create the plot line +$p1 = new LinePlot($ydata); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +SetScale('intlin'); +$graph->SetMargin(30,15,40,30); +$graph->SetMarginColor('white'); +$graph->SetFrame(true,'blue',3); + +$graph->title->Set('Label background'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10); +$graph->subtitle->SetColor('darkred'); +$graph->subtitle->Set('"LABELBKG_YAXIS"'); + +$graph->SetAxisLabelBackground(LABELBKG_YAXIS,'orange','red','lightblue','red'); + +// Use Ariel font +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->xgrid->Show(); + +// Create the plot line +$p1 = new LinePlot($ydata); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex04.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex04.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex04.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex04.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +SetScale('intlin'); +$graph->SetMargin(30,15,40,30); +$graph->SetMarginColor('white'); +$graph->SetFrame(true,'blue',3); + +$graph->title->Set('Label background'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10); +$graph->subtitle->SetColor('darkred'); +$graph->subtitle->Set('"LABELBKG_YAXISFULL"'); + +$graph->SetAxisLabelBackground(LABELBKG_YAXISFULL,'orange','red','lightblue','red'); + +// Use Ariel font +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->xgrid->Show(); + +// Create the plot line +$p1 = new LinePlot($ydata); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex05.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex05.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex05.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex05.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +SetScale('intlin'); +$graph->SetMargin(30,15,40,30); +$graph->SetMarginColor('white'); +$graph->SetFrame(true,'blue',3); + +$graph->title->Set('Label background'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10); +$graph->subtitle->SetColor('darkred'); +$graph->subtitle->Set('"LABELBKG_XAXISFULL"'); + +$graph->SetAxisLabelBackground(LABELBKG_XAXISFULL,'orange','red','lightblue','red'); + +// Use Ariel font +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->xgrid->Show(); + +// Create the plot line +$p1 = new LinePlot($ydata); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex06.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex06.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex06.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex06.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +SetScale('intlin'); +$graph->SetMargin(30,15,40,30); +$graph->SetMarginColor('white'); +$graph->SetFrame(true,'blue',3); + +$graph->title->Set('Label background'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10); +$graph->subtitle->SetColor('darkred'); +$graph->subtitle->Set('"LABELBKG_XYFULL"'); + +$graph->SetAxisLabelBackground(LABELBKG_XYFULL,'orange','red','lightblue','red'); + +// Use Ariel font +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->xgrid->Show(); + +// Create the plot line +$p1 = new LinePlot($ydata); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex07.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex07.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex07.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/axislabelbkgex07.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +SetScale('intlin'); +$graph->SetMargin(30,15,40,30); +$graph->SetMarginColor('white'); +$graph->SetFrame(true,'blue',3); + +$graph->title->Set('Label background'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,10); +$graph->subtitle->SetColor('darkred'); +$graph->subtitle->Set('"LABELBKG_XY"'); + +$graph->SetAxisLabelBackground(LABELBKG_XY,'orange','red','lightblue','red'); + +// Use Ariel font +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->xgrid->Show(); + +// Create the plot line +$p1 = new LinePlot($ydata); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +clearTheme(); +$graph->img->SetMargin(40,180,40,40); +$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLPLOT); + +$graph->img->SetAntiAliasing("white"); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->title->Set("Background image"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Slightly adjust the legend from it's default position in the +// top right corner. +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Create the first line +$p1 = new LinePlot($datay); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$p1->SetColor("blue"); +$p1->SetCenter(); +$p1->SetLegend("Triumph Tiger -98"); +$graph->Add($p1); + +// ... and the second +$p2 = new LinePlot($data2y); +$p2->mark->SetType(MARK_STAR); +$p2->mark->SetFillColor("red"); +$p2->mark->SetWidth(4); +$p2->SetColor("red"); +$p2->SetCenter(); +$p2->SetLegend("New tiger -99"); +$graph->Add($p2); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +clearTheme(); +$graph->img->SetMargin(40,180,40,40); +$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME); + +$graph->img->SetAntiAliasing(); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->title->Set("Background image"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Slightly adjust the legend from it's default position in the +// top right corner. +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Create the first line +$p1 = new LinePlot($datay); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$p1->SetColor("blue"); +$p1->SetCenter(); +$p1->SetLegend("Triumph Tiger -98"); +$graph->Add($p1); + +// ... and the second +$p2 = new LinePlot($data2y); +$p2->mark->SetType(MARK_STAR); +$p2->mark->SetFillColor("red"); +$p2->mark->SetWidth(4); +$p2->SetColor("red"); +$p2->SetCenter(); +$p2->SetLegend("New tiger -99"); +$graph->Add($p2); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/backgroundex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +clearTheme(); +$graph->img->SetMargin(40,180,40,40); +$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_COPY); + +$graph->img->SetAntiAliasing("white"); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->title->Set("Background image"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Slightly adjust the legend from it's default position in the +// top right corner. +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Create the first line +$p1 = new LinePlot($datay); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$p1->SetColor("blue"); +$p1->SetCenter(); +$p1->SetLegend("Triumph Tiger -98"); +$graph->Add($p1); + +// ... and the second +$p2 = new LinePlot($data2y); +$p2->mark->SetType(MARK_STAR); +$p2->mark->SetFillColor("red"); +$p2->mark->SetWidth(4); +$p2->SetColor("red"); +$p2->SetCenter(); +$p2->SetLegend("New tiger -99"); +$graph->Add($p2); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMargin(40,40,50,50); + +// Setup the grid and plotarea box +$graph->ygrid->SetLineStyle('dashed'); +$graph->ygrid->setColor('darkgray'); +$graph->SetBox(true); + +// Steup graph titles +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->Set('Using background image'); +$graph->subtitle->SetFont(FF_COURIER,FS_BOLD,11); +$graph->subtitle->Set('"BGIMG_COPY"'); +$graph->subtitle->SetColor('darkred'); + +// Add background with 25% mix +$graph->SetBackgroundImage('heat1.jpg',BGIMG_COPY); +$graph->SetBackgroundImageMix(25); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor("blue"); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMargin(40,40,50,50); + +// Setup the grid and plotarea box +$graph->ygrid->SetLineStyle('dashed'); +$graph->ygrid->setColor('darkgray'); +$graph->SetBox(true); + +// Steup graph titles +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->Set('Using background image'); +$graph->subtitle->SetFont(FF_COURIER,FS_BOLD,11); +$graph->subtitle->Set('"BGIMG_CENTER"'); +$graph->subtitle->SetColor('darkred'); + +// Add background with 25% mix +$graph->SetBackgroundImage('heat1.jpg',BGIMG_CENTER); +$graph->SetBackgroundImageMix(25); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor("blue"); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMargin(40,40,50,50); + +// Setup the grid and plotarea box +$graph->ygrid->SetLineStyle('dashed'); +$graph->ygrid->setColor('darkgray'); +$graph->SetBox(true); + +// Steup graph titles +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->Set('Using background image'); +$graph->subtitle->SetFont(FF_COURIER,FS_BOLD,11); +$graph->subtitle->Set('"BGIMG_FREE"'); +$graph->subtitle->SetColor('darkred'); + +// Add background with 25% mix +$graph->SetBackgroundImage('heat1.jpg',BGIMG_FREE); +$graph->SetBackgroundImageMix(25); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor("blue"); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMargin(40,40,50,50); + +// Setup the grid and plotarea box +$graph->ygrid->SetLineStyle('dashed'); +$graph->ygrid->setColor('darkgray'); +$graph->SetBox(true); + +// Steup graph titles +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->Set('Using background image'); +$graph->subtitle->SetFont(FF_COURIER,FS_BOLD,11); +$graph->subtitle->Set('"BGIMG_FILLPLOT"'); +$graph->subtitle->SetColor('darkred'); + +// Add background with 25% mix +$graph->SetBackgroundImage('heat1.jpg',BGIMG_FILLPLOT); +$graph->SetBackgroundImageMix(25); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor("blue"); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/background_type_ex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMargin(40,40,50,50); + +// Setup the grid and plotarea box +$graph->ygrid->SetLineStyle('dashed'); +$graph->ygrid->setColor('darkgray'); +$graph->SetBox(true); + +// Steup graph titles +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->Set('Using background image'); +$graph->subtitle->SetFont(FF_COURIER,FS_BOLD,11); +$graph->subtitle->Set('"BGIMG_FILLFRAME"'); +$graph->subtitle->SetColor('darkred'); + +// Add background with 25% mix +$graph->SetBackgroundImage('heat1.jpg',BGIMG_FILLFRAME); +$graph->SetBackgroundImageMix(25); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor("blue"); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/balloonex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/balloonex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/balloonex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/balloonex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,55 @@ +clearTheme(); +$graph->SetScale("linlin"); +$graph->img->SetMargin(40,100,40,40); +$graph->SetShadow(); +$graph->title->Set("Example of ballon scatter plot"); +// Use a lot of grace to get large scales +$graph->yaxis->scale->SetGrace(50,10); + +// Make sure X-axis as at the bottom of the graph +$graph->xaxis->SetPos('min'); + +// Create the scatter plot +$sp1 = new ScatterPlot($datay,$datax); +$sp1->mark->SetType(MARK_FILLEDCIRCLE); + +// Uncomment the following two lines to display the values +$sp1->value->Show(); +$sp1->value->SetFont(FF_FONT1,FS_BOLD); + +// Specify the callback +$sp1->mark->SetCallback("FCallback"); + +// Setup the legend for plot +$sp1->SetLegend('Year 2002'); + +// Add the scatter plot to the graph +$graph->Add($sp1); + +// ... and send to browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/balloonex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/balloonex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/balloonex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/balloonex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,80 @@ +clearTheme(); +$graph->SetScale("intlin"); +$graph->SetMargin(40,40,40,40); +$graph->SetMarginColor('wheat'); + +$graph->title->Set("Example of ballon scatter plot with X,Y callback"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->SetMargin(10); + +// Use a lot of grace to get large scales since the ballon have +// size and we don't want them to collide with the X-axis +$graph->yaxis->scale->SetGrace(50,10); +$graph->xaxis->scale->SetGrace(50,10); + +// Make sure X-axis as at the bottom of the graph and not at the default Y=0 +$graph->xaxis->SetPos('min'); + +// Set X-scale to start at 0 +$graph->xscale->SetAutoMin(0); + +// Create the scatter plot +$sp1 = new ScatterPlot($datay,$datax); +$sp1->mark->SetType(MARK_FILLEDCIRCLE); + +// Uncomment the following two lines to display the values +$sp1->value->Show(); +$sp1->value->SetFont(FF_FONT1,FS_BOLD); + +// Specify the callback +$sp1->mark->SetCallbackYX("FCallback"); + +// Add the scatter plot to the graph +$graph->Add($sp1); + +// ... and send to browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bar2scalesex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bar2scalesex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bar2scalesex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bar2scalesex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +clearTheme(); +$graph->title->Set('Example with 2 scale bars'); + +// Setup Y and Y2 scales with some "grace" +$graph->SetScale("textlin"); +$graph->SetY2Scale("lin"); +$graph->yaxis->scale->SetGrace(30); +$graph->y2axis->scale->SetGrace(30); + +//$graph->ygrid->Show(true,true); +$graph->ygrid->SetColor('gray','lightgray@0.5'); + +// Setup graph colors +$graph->SetMarginColor('white'); +$graph->y2axis->SetColor('darkred'); + + +// Create the "dummy" 0 bplot +$bplotzero = new BarPlot($datazero); + +// Create the "Y" axis group +$ybplot1 = new BarPlot($datay); +$ybplot1->value->Show(); +$ybplot = new GroupBarPlot(array($ybplot1,$bplotzero)); + +// Create the "Y2" axis group +$ybplot2 = new BarPlot($datay2); +$ybplot2->value->Show(); +$ybplot2->value->SetColor('darkred'); +$ybplot2->SetFillColor('darkred'); +$y2bplot = new GroupBarPlot(array($bplotzero,$ybplot2)); + +// Add the grouped bar plots to the graph +$graph->Add($ybplot); +$graph->AddY2($y2bplot); + +// .. and finally stroke the image back to browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_errhandling_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_errhandling_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_errhandling_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_errhandling_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,16 @@ +Stroke('abc123'); +} catch( JpGraphException $e ) { + //echo 'Error: ' . $e->getMessage()."\n"; + JpGraphError::Raise($e->getMessage()); +} + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,11 @@ +Stroke('ABC123'); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,14 @@ +SetModuleWidth(2); +$e->SetHeight(20); +echo nl2br($e->Stroke('3125134772')); + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,14 @@ +SetModuleWidth(2); +$e->SetHeight(70); +$ps = $e->Stroke('3125134772'); +echo nl2br(htmlspecialchars($ps)); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,17 @@ +"; +$encoder = BarcodeFactory::Create(ENCODING_CODEI25); +$e = BackendFactory::Create(BACKEND_PS,$encoder); +$e->SetModuleWidth(2); +$e->SetHeight(70); +$e->SetEPS(); +$ps = $e->Stroke('3125134772'); +echo nl2br(htmlspecialchars($ps)); + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_ex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +SetModuleWidth(2); +$e->Stroke('1234'); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_usps_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_usps_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_usps_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcode_usps_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,74 @@ +_USPS_chkd(substr($data,8)); + $data = '420'. $aZIP . '~191' . $aServiceType . $aDUNS . $aSeqNbr; + return $data . $cd; + } + + // Get type 2 of confirmation code (without ZIP) + function GetPIC($aServiceType,$aDUNS,$aSeqNbr) { + // Convert to USPS format with AI=91 + $data = '91' . $aServiceType . $aDUNS . $aSeqNbr; + $cd = $this->_USPS_chkd($data); + return $data . $cd; + } + +} + +$usps = new USPS_Confirmation(); +$zip = '92663'; +$service = '21'; +$DUNS = '805213907'; +$seqnr = '04508735'; +$data = $usps->GetPICwithZIP($zip,$service,$DUNS,$seqnr); +//$data = $usps->GetPIC('01','123456789','00000001'); + +$encoder = BarcodeFactory::Create(ENCODING_EAN128); +$e = BackendFactory::Create(BACKEND_IMAGE,$encoder); +$e->SetModuleWidth(2); +$e->SetFont(FF_ARIAL,FS_NORMAL,14); +$e->Stroke($data); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcsim_details.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcsim_details.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcsim_details.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcsim_details.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,10 @@ +'.basename(__FILE__).'.'; +} +else { + echo 'Some details on bar with id='.$_GET['id']; +} + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,52 @@ +SetScale("textlin"); +$graph->img->SetMargin(60,30,20,40); +$graph->yaxis->SetTitleMargin(45); +$graph->yaxis->scale->SetGrace(30); +$graph->SetShadow(); + +// Turn the tickmarks +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Create a bar pot +$bplot = new BarPlot($datay); + +// Create targets for the image maps. One for each column +$targ=array("bar_clsmex1.php#1","bar_clsmex1.php#2","bar_clsmex1.php#3","bar_clsmex1.php#4","bar_clsmex1.php#5","bar_clsmex1.php#6"); +$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); +$bplot->SetCSIMTargets($targ,$alts); +$bplot->SetFillColor("orange"); + +// Use a shadow on the bar graphs (just use the default settings) +$bplot->SetShadow(); +$bplot->value->SetFormat(" $ %2.1f",70); +$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,9); +$bplot->value->SetColor("blue"); +$bplot->value->Show(); + +$graph->Add($bplot); + +$graph->title->Set("Image maps barex1"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Send back the HTML page which will call this script again +// to retrieve the image. +$graph->StrokeCSIM(); + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +SetScale("textlin"); +$graph->img->SetMargin(40,30,20,40); +$graph->SetShadow(); + +// Create the bar plots +$b1plot = new BarPlot($data1y); +$b1plot->SetFillColor("orange"); +$targ=array("bar_clsmex2.php#1","bar_clsmex2.php#2","bar_clsmex2.php#3", +"bar_clsmex2.php#4","bar_clsmex2.php#5","bar_clsmex2.php#6"); +$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); +$b1plot->SetCSIMTargets($targ,$alts); + +$b2plot = new BarPlot($data2y); +$b2plot->SetFillColor("blue"); +$targ=array("bar_clsmex2.php#7","bar_clsmex2.php#8","bar_clsmex2.php#9", +"bar_clsmex2.php#10","bar_clsmex2.php#11","bar_clsmex2.php#12"); +$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); +$b2plot->SetCSIMTargets($targ,$alts); + +// Create the grouped bar plot +$abplot = new AccBarPlot(array($b1plot,$b2plot)); + +$abplot->SetShadow(); +$abplot->value->Show(); + +// ...and add it to the graPH +$graph->Add($abplot); + +$graph->title->Set("Image map barex2"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + + +// Send back the HTML page which will call this script again +// to retrieve the image. +$graph->StrokeCSIM(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bar_csimex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,88 @@ +SetAngle(90); +$graph->SetScale("textlin"); + +// The negative margins are necessary since we +// have rotated the image 90 degress and shifted the +// meaning of width, and height. This means that the +// left and right margins now becomes top and bottom +// calculated with the image width and not the height. +$graph->img->SetMargin(-80,-80,210,210); + +$graph->SetMarginColor('white'); + +// Setup title for graph +$graph->title->Set('Horizontal bar graph'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->subtitle->Set("With image map\nNote: The URL just points back to this image"); + +// Setup X-axis. +$graph->xaxis->SetTitle("X-title",'center'); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetAngle(90); +$graph->xaxis->SetTitleMargin(30); +$graph->xaxis->SetLabelMargin(15); +$graph->xaxis->SetLabelAlign('right','center'); + +// Setup Y-axis + +// First we want it at the bottom, i.e. the 'max' value of the +// x-axis +$graph->yaxis->SetPos('max'); + +// Arrange the title +$graph->yaxis->SetTitle("Turnaround (mkr)",'center'); +$graph->yaxis->SetTitleSide(SIDE_RIGHT); +$graph->yaxis->title->SetFont(FF_FONT2,FS_BOLD); +$graph->yaxis->title->SetAngle(0); +$graph->yaxis->title->Align('center','top'); +$graph->yaxis->SetTitleMargin(30); + +// Arrange the labels +$graph->yaxis->SetLabelSide(SIDE_RIGHT); +$graph->yaxis->SetLabelAlign('center','top'); + +// Create the bar plots with image maps +$b1plot = new BarPlot($data1y); +$b1plot->SetFillColor("orange"); +$targ=array("bar_clsmex2.php#1","bar_clsmex2.php#2","bar_clsmex2.php#3", + "bar_clsmex2.php#4","bar_clsmex2.php#5","bar_clsmex2.php#6"); +$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); +$b1plot->SetCSIMTargets($targ,$alts); + +$b2plot = new BarPlot($data2y); +$b2plot->SetFillColor("blue"); +$targ=array("bar_clsmex2.php#7","bar_clsmex2.php#8","bar_clsmex2.php#9", + "bar_clsmex2.php#10","bar_clsmex2.php#11","bar_clsmex2.php#12"); +$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); +$b2plot->SetCSIMTargets($targ,$alts); + +// Create the accumulated bar plot +$abplot = new AccBarPlot(array($b1plot,$b2plot)); +$abplot->SetShadow(); + +// We want to display the value of each bar at the top +$abplot->value->Show(); +$abplot->value->SetFont(FF_FONT1,FS_NORMAL); +$abplot->value->SetAlign('left','center'); +$abplot->value->SetColor("black","darkred"); +$abplot->value->SetFormat('%.1f mkr'); + +// ...and add it to the graph +$graph->Add($abplot); + +// Send back the HTML page which will call this script again +// to retrieve the image. +$graph->StrokeCSIM(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcsim_popup.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcsim_popup.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barcsim_popup.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barcsim_popup.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +SetScale("textlin"); + +// Create a bar pot +$bplot = new BarPlot($datay); + +// Create targets for the image maps so that the details are opened in a separate window +$fmtStr = "javascript:window.open('barcsim_details.php?id=%d','_new','width=500,height=300');void(0)"; +$n = count($datay); +$targ=array(); +$alts=array(); +for($i=0; $i < $n; ++$i) { + $targ[$i] = sprintf($fmtStr,$i+1); + $alts[$i] = 'val=%d'; + // Note: The format placeholder val=%d will be replaced by the actual value in the ouput HTML by the + // library so that when the user hoovers the mouse over the bar the actual numerical value of the bar + // will be dísplayed +} +$bplot->SetCSIMTargets($targ,$alts); + +// Add plot to graph +$graph->Add($bplot); + +// Setup the title, also wih a CSIM area +$graph->title->Set("CSIM with popup windows"); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +// Assume we can give more details on the graph +$graph->title->SetCSIMTarget(sprintf($fmtStr,-1),'Title for Bar'); + +// Send back the HTML page which will call this script again to retrieve the image. +$graph->StrokeCSIM(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barformatcallbackex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barformatcallbackex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barformatcallbackex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barformatcallbackex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +SetScale("textlin"); + +// Create a bar plots +$bar1 = new BarPlot($data); + +// Setup the callback function +$bar1->value->SetFormatCallback("cbFmtPercentage"); +$bar1->value->Show(); + +// Add the plot to the graph +$graph->Add($bar1); + +// .. and send the graph back to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +clearTheme(); +$graph->img->SetMargin(60,20,35,75); +$graph->SetScale("textlin"); +$graph->SetMarginColor("lightblue:1.1"); +$graph->SetShadow(); + +// Set up the title for the graph +$graph->title->Set("Bar gradient with left reflection"); +$graph->title->SetMargin(8); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor("darkred"); + +// Setup font for axis +$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,10); +$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,10); + +// Show 0 label on Y-axis (default is not to show) +$graph->yscale->ticks->SupressZeroLabel(false); + +// Setup X-axis labels +$graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetLabelAngle(50); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$bplot->SetFillGradient("navy:0.9","navy:1.85",GRAD_LEFT_REFLECTION); + +// Set color for the frame of each bar +$bplot->SetColor("white"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +clearTheme(); +$graph->img->SetMargin(60,20,30,50); +$graph->SetScale("textlin"); +$graph->SetMarginColor("silver"); +$graph->SetShadow(); + +// Set up the title for the graph +$graph->title->Set("Example negative bars"); +$graph->title->SetFont(FF_VERDANA,FS_NORMAL,18); +$graph->title->SetColor("darkred"); + +// Setup font for axis +$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,12); +$graph->xaxis->SetColor("black","red"); +$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,11); + +// Show 0 label on Y-axis (default is not to show) +$graph->yscale->ticks->SupressZeroLabel(false); + +// Setup X-axis labels +$graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetLabelAngle(50); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$bplot->SetFillGradient("navy","steelblue",GRAD_MIDVER); + +// Set color for the frame of each bar +$bplot->SetColor("navy"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +clearTheme(); +$graph->img->SetMargin(60,20,30,50); +$graph->SetScale("textlin"); +$graph->SetMarginColor("silver"); +$graph->SetShadow(); + +// Set up the title for the graph +$graph->title->Set("Example negative bars"); +$graph->title->SetFont(FF_VERDANA,FS_NORMAL,16); +$graph->title->SetColor("darkred"); + +// Setup font for axis +$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,10); +$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,10); + +// Show 0 label on Y-axis (default is not to show) +$graph->yscale->ticks->SupressZeroLabel(false); + +// Setup X-axis labels +$graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetLabelAngle(50); + +// Set X-axis at the minimum value of Y-axis (default will be at 0) +$graph->xaxis->SetPos("min"); // "min" will position the x-axis at the minimum value of the Y-axis + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$bplot->SetFillGradient("navy","steelblue",GRAD_MIDVER); + +// Set color for the frame of each bar +$bplot->SetColor("navy"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +clearTheme(); +$graph->img->SetMargin(60,30,30,40); +$graph->SetScale("textlin"); +$graph->SetMarginColor("teal"); +$graph->SetShadow(); + +// Set up the title for the graph +$graph->title->Set("Bargraph with small variations"); +$graph->title->SetColor("white"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); + +// Setup color for axis and labels +$graph->xaxis->SetColor("black","white"); +$graph->yaxis->SetColor("black","white"); + +// Setup font for axis +$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,10); +$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,10); + +// Setup X-axis title (color & font) +$graph->xaxis->title->Set("X-axis"); +$graph->xaxis->title->SetColor("white"); +$graph->xaxis->title->SetFont(FF_VERDANA,FS_BOLD,10); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$tcol=array(100,100,255); +$fcol=array(255,100,100); +$bplot->SetFillGradient($fcol,$tcol,GRAD_HOR); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +clearTheme(); +$graph->img->SetMargin(60,30,30,40); +$graph->SetScale("textlin"); +$graph->SetMarginColor("teal"); +$graph->SetShadow(); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// This is how you make the bar graph start from something other than 0 +$bplot->SetYMin(0.302); + +// Setup color for gradient fill style +$tcol=array(100,100,255); +$fcol=array(255,100,100); +$bplot->SetFillGradient($fcol,$tcol,GRAD_HOR); +$bplot->SetFillColor("orange"); +$graph->Add($bplot); + +// Set up the title for the graph +$graph->title->Set("Bargraph which doesn't start from y=0"); +$graph->title->SetColor("yellow"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); + +// Setup color for axis and labels +$graph->xaxis->SetColor("black","white"); +$graph->yaxis->SetColor("black","white"); + +// Setup font for axis +$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,10); +$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,10); + +// Setup X-axis title (color & font) +$graph->xaxis->title->Set("X-axis"); +$graph->xaxis->title->SetColor("white"); +$graph->xaxis->title->SetFont(FF_VERDANA,FS_BOLD,10); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,52 @@ +clearTheme(); +$graph->img->SetMargin(60,150,30,50); +$graph->SetScale("textlin"); +$graph->SetMarginColor("silver"); +$graph->SetShadow(); + +// Set up the title for the graph +$graph->title->Set("Example negative bars"); +$graph->title->SetFont(FF_VERDANA,FS_NORMAL,16); +$graph->title->SetColor("darkred"); + +// Setup font for axis +$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,10); +$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,10); + +// Show 0 label on Y-axis (default is not to show) +$graph->yscale->ticks->SupressZeroLabel(false); + +// Setup X-axis labels +$graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetLabelAngle(50); + +// Set X-axis at the minimum value of Y-axis (default will be at 0) +$graph->xaxis->SetPos("min"); // "min" will position the x-axis at the minimum value of the Y-axis + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); +$bplot->SetLegend("Result 1999","blue"); + +// Setup color for gradient fill style +$bplot->SetFillGradient("navy","steelblue",GRAD_MIDVER); + +// Set color for the frame of each bar +$bplot->SetColor("navy"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +SetScale("textlin"); +$graph->img->SetMargin(25,15,25,25); + +$graph->title->Set('"GRAD_MIDVER"'); +$graph->title->SetColor('darkred'); + +// Setup font for axis +$graph->xaxis->SetFont(FF_FONT1); +$graph->yaxis->SetFont(FF_FONT1); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDVER); + +// Set color for the frame of each bar +$bplot->SetColor("navy"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +SetScale("textlin"); +$graph->img->SetMargin(25,15,25,25); + +$graph->title->Set('"GRAD_MIDHOR"'); +$graph->title->SetColor('darkred'); + +// Setup font for axis +$graph->xaxis->SetFont(FF_FONT1); +$graph->yaxis->SetFont(FF_FONT1); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$bplot->SetFillGradient("navy","lightsteelblue",GRAD_MIDHOR); + +// Set color for the frame of each bar +$bplot->SetColor("navy"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +SetScale("textlin"); +$graph->img->SetMargin(25,15,25,25); + +$graph->title->Set('"GRAD_HOR"'); +$graph->title->SetColor('darkred'); + +// Setup font for axis +$graph->xaxis->SetFont(FF_FONT1); +$graph->yaxis->SetFont(FF_FONT1); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$bplot->SetFillGradient("navy","lightsteelblue",GRAD_HOR); + +// Set color for the frame of each bar +$bplot->SetColor("navy"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +SetScale("textlin"); +$graph->img->SetMargin(25,15,25,25); + +$graph->title->Set('"GRAD_VER"'); +$graph->title->SetColor('darkred'); + +// Setup font for axis +$graph->xaxis->SetFont(FF_FONT1); +$graph->yaxis->SetFont(FF_FONT1); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$bplot->SetFillGradient("navy","lightsteelblue",GRAD_VER); + +// Set color for the frame of each bar +$bplot->SetColor("navy"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +SetScale("textlin"); +$graph->img->SetMargin(25,15,25,25); + +$graph->title->Set('"GRAD_WIDE_MIDVER"'); +$graph->title->SetColor('darkred'); + +// Setup font for axis +$graph->xaxis->SetFont(FF_FONT1); +$graph->yaxis->SetFont(FF_FONT1); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$bplot->SetFillGradient("navy","lightsteelblue",GRAD_WIDE_MIDVER); + +// Set color for the frame of each bar +$bplot->SetColor("navy"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +SetScale("textlin"); +$graph->img->SetMargin(25,15,25,25); + +$graph->title->Set('"GRAD_WIDE_MIDHOR"'); +$graph->title->SetColor('darkred'); + +// Setup font for axis +$graph->xaxis->SetFont(FF_FONT1); +$graph->yaxis->SetFont(FF_FONT1); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$bplot->SetFillGradient("navy","lightsteelblue",GRAD_WIDE_MIDHOR); + +// Set color for the frame of each bar +$bplot->SetColor("navy"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +SetScale("textlin"); +$graph->img->SetMargin(25,15,25,25); + +$graph->title->Set('"GRAD_CENTER"'); +$graph->title->SetColor('darkred'); + +// Setup font for axis +$graph->xaxis->SetFont(FF_FONT1); +$graph->yaxis->SetFont(FF_FONT1); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$bplot->SetFillGradient("navy","lightsteelblue",GRAD_CENTER); + +// Set color for the frame of each bar +$bplot->SetColor("navy"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex8.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex8.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex8.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bargradsmallex8.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +SetScale("textlin"); +$graph->img->SetMargin(25,15,25,25); + +$graph->title->Set('"GRAD_RAISED_PANEL"'); +$graph->title->SetColor('darkred'); + +// Setup font for axis +$graph->xaxis->SetFont(FF_FONT1); +$graph->yaxis->SetFont(FF_FONT1); + +// Create the bar pot +$bplot = new BarPlot($datay); +$bplot->SetWidth(0.6); + +// Setup color for gradient fill style +$bplot->SetFillGradient('navy','orange',GRAD_RAISED_PANEL); + +// Set color for the frame of each bar +$bplot->SetColor("navy"); +$graph->Add($bplot); + +// Finally send the graph to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barimgex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barimgex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barimgex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barimgex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$graph->title->Set('Images on top of bars'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,13); + +$graph->SetTitleBackground('lightblue:1.1',TITLEBKG_STYLE1,TITLEBKG_FRAME_BEVEL); + +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); +$bplot->SetWidth(0.5); + +$lplot = new LinePlot($datay); +$lplot->SetColor('white@1'); +$lplot->SetBarCenter(); +$lplot->mark->SetType(MARK_IMG_LBALL,'red'); + +$graph->Add($bplot); +$graph->Add($lplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barintex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barintex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barintex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barintex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +clearTheme(); +$graph->img->SetMargin(40,30,30,40); +$graph->SetScale("textint"); +$graph->SetShadow(); +$graph->SetFrame(false); // No border around the graph + +// Add some grace to the top so that the scale doesn't +// end exactly at the max value. +$graph->yaxis->scale->SetGrace(100); + +// Setup X-axis labels +$a = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($a); +$graph->xaxis->SetFont(FF_FONT2); + +// Setup graph title ands fonts +$graph->title->Set("Example of integer Y-scale"); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->xaxis->title->Set("Year 2002"); +$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); +$bplot->SetWidth(0.5); +$bplot->SetShadow(); + +// Setup the values that are displayed on top of each bar +$bplot->value->Show(); +// Must use TTF fonts if we want text at an arbitrary angle +$bplot->value->SetFont(FF_ARIAL,FS_BOLD); +$bplot->value->SetAngle(45); +// Black color for positive values and darkred for negative values +$bplot->value->SetColor("black","darkred"); +$graph->Add($bplot); + +// Finally stroke the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barintex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barintex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barintex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barintex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ +clearTheme(); +$graph->img->SetMargin(40,30,40,40); +$graph->SetScale("textint"); +$graph->SetFrame(true,'blue',1); +$graph->SetColor('lightblue'); +$graph->SetMarginColor('lightblue'); + +// Add some grace to the top so that the scale doesn't +// end exactly at the max value. +//$graph->yaxis->scale->SetGrace(20); + +// Setup X-axis labels +$a = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($a); +$graph->xaxis->SetFont(FF_FONT1); +$graph->xaxis->SetColor('darkblue','black'); + +// Stup "hidden" y-axis by given it the same color +// as the background +$graph->yaxis->SetColor('lightblue','darkblue'); +$graph->ygrid->SetColor('white'); + +// Setup graph title ands fonts +$graph->title->Set('Example of integer Y-scale'); +$graph->subtitle->Set('(With "hidden" y-axis)'); + +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->xaxis->title->Set("Year 2002"); +$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor('darkblue'); +$bplot->SetColor('darkblue'); +$bplot->SetWidth(0.5); +$bplot->SetShadow('darkgray'); + +// Setup the values that are displayed on top of each bar +$bplot->value->Show(); +// Must use TTF fonts if we want text at an arbitrary angle +$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,8); +$bplot->value->SetFormat('$%d'); +// Black color for positive values and darkred for negative values +$bplot->value->SetColor("black","darkred"); +$graph->Add($bplot); + +// Finally stroke the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barlinealphaex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barlinealphaex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barlinealphaex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barlinealphaex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,74 @@ +GetShortMonth(); + +// Create the graph. +$graph = new Graph(300,200); +$graph->SetScale("textlin"); +$graph->SetMarginColor('white'); + +// Adjust the margin slightly so that we use the +// entire area (since we don't use a frame) +$graph->SetMargin(30,1,20,5); + +// Box around plotarea +$graph->SetBox(); + +// No frame around the image +$graph->SetFrame(false); + +// Setup the tab title +$graph->tabtitle->Set('Year 2003'); +$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,10); + +// Setup the X and Y grid +$graph->ygrid->SetFill(true,'#DDDDDD@0.5','#BBBBBB@0.5'); +$graph->ygrid->SetLineStyle('dashed'); +$graph->ygrid->SetColor('gray'); +$graph->xgrid->Show(); +$graph->xgrid->SetLineStyle('dashed'); +$graph->xgrid->SetColor('gray'); + +// Setup month as labels on the X-axis +$graph->xaxis->SetTickLabels($months); +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,8); +$graph->xaxis->SetLabelAngle(45); + +// Create a bar pot +$bplot = new BarPlot($ydata); +$bplot->SetWidth(0.6); +$fcol='#440000'; +$tcol='#FF9090'; + +$bplot->SetFillGradient($fcol,$tcol,GRAD_LEFT_REFLECTION); + +// Set line weigth to 0 so that there are no border +// around each bar +$bplot->SetWeight(0); + +$graph->Add($bplot); + +// Create filled line plot +$lplot = new LinePlot($ydata2); +$lplot->SetFillColor('skyblue@0.5'); +$lplot->SetColor('navy@0.7'); +$lplot->SetBarCenter(); + +$lplot->mark->SetType(MARK_SQUARE); +$lplot->mark->SetColor('blue@0.5'); +$lplot->mark->SetFillColor('lightblue'); +$lplot->mark->SetSize(6); + +$graph->Add($lplot); + +// .. and finally send it back to the browser +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barline_csimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barline_csimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barline_csimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barline_csimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetScale("textlin"); +$graph->img->SetMargin(40,20,30,40); +$graph->title->Set("CSIM example with bar and line"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Setup axis titles +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->mark->SetType(MARK_FILLEDCIRCLE); +$lineplot->mark->SetWidth(5); +$lineplot->mark->SetColor('black'); +$lineplot->mark->SetFillColor('red'); +$lineplot->SetCSIMTargets($targ,$alt); + +// Create line plot +$barplot=new barPlot($ydata2); +$barplot->SetCSIMTargets($targ,$alt); + +// Add the plots to the graph +$graph->Add($lineplot); +$graph->Add($barplot); + +$graph->StrokeCSIM(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barlinefreq_csimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barlinefreq_csimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barlinefreq_csimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barlinefreq_csimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,100 @@ +CheckCSIMCache('auto'); + +// Setup some basic graph parameters +$graph->SetScale("textlin"); +$graph->SetY2Scale('lin',0,100); +$graph->img->SetMargin(50,70,30,40); +$graph->yaxis->SetTitleMargin(30); +$graph->SetMarginColor('#EEEEEE'); + +// Setup titles and fonts +$graph->title->Set("Frequence plot"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Turn the tickmarks +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +$graph->y2axis->SetTickSide(SIDE_RIGHT); +$graph->y2axis->SetColor('black','blue'); +$graph->y2axis->SetLabelFormat('%3d.0%%'); + +// Create a bar pot +$bplot = new BarPlot($data_freq); + +// Create targets and alt texts for the image maps. One for each bar +// (In this example this is just "dummy" targets) +$targ=array("#1","#2","#3","#4","#5","#6","#7"); +$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); +$bplot->SetCSIMTargets($targ,$alts); + + +// Create accumulative graph +$lplot = new LinePlot($data_accfreq); + +// We want the line plot data point in the middle of the bars +$lplot->SetBarCenter(); + +// Use transperancy +$lplot->SetFillColor('lightblue@0.6'); +$lplot->SetColor('blue@0.6'); +//$lplot->SetColor('blue'); +$graph->AddY2($lplot); + + +// Setup the bars +$bplot->SetFillColor("orange@0.2"); +$bplot->SetValuePos('center'); +$bplot->value->SetFormat("%d"); +$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,9); +$bplot->value->Show(); + +// Add it to the graph +$graph->Add($bplot); + +// Send back the HTML page which will call this script again +// to retrieve the image. +$graph->StrokeCSIM(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barlinefreqex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barlinefreqex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barlinefreqex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barlinefreqex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,84 @@ +clearTheme(); + +// Setup some basic graph parameters +$graph->SetScale("textlin"); +$graph->SetY2Scale('lin',0,100); +$graph->img->SetMargin(50,70,30,40); +$graph->yaxis->SetTitleMargin(30); +$graph->SetMarginColor('#EEEEEE'); + +// Setup titles and fonts +$graph->title->Set("Frequence plot"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Turn the tickmarks +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +$graph->y2axis->SetTickSide(SIDE_RIGHT); +$graph->y2axis->SetColor('black','blue'); +$graph->y2axis->SetLabelFormat('%3d.0%%'); + +// Create a bar pot +$bplot = new BarPlot($data_freq); + +// Create accumulative graph +$lplot = new LinePlot($data_accfreq); + +// We want the line plot data point in the middle of the bars +$lplot->SetBarCenter(); + +// Use transperancy +$lplot->SetFillColor('lightblue@0.6'); +$lplot->SetColor('blue@0.6'); +$graph->AddY2($lplot); + +// Setup the bars +$bplot->SetFillColor("orange@0.2"); +$bplot->SetValuePos('center'); +$bplot->value->SetFormat("%d"); +$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,9); +$bplot->value->Show(); + +// Add it to the graph +$graph->Add($bplot); + +// Send back the HTML page which will call this script again +// to retrieve the image. +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barpatternex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barpatternex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barpatternex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barpatternex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +clearTheme(); + +$graph->SetScale("textlin"); + +$graph->SetMarginColor('navy:1.9'); +$graph->SetBox(); + +$graph->title->Set('Bar Pattern'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,20); + +$graph->SetTitleBackground('lightblue:1.3',TITLEBKG_STYLE2,TITLEBKG_FRAME_BEVEL); +$graph->SetTitleBackgroundFillStyle(TITLEBKG_FILLSTYLE_HSTRIPED,'lightblue','blue'); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor('darkorange'); +$bplot->SetWidth(0.6); + +$bplot->SetPattern(PATTERN_CROSS1,'navy'); + +$graph->Add($bplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barscalecallbackex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barscalecallbackex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/barscalecallbackex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/barscalecallbackex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,64 @@ +clearTheme(); +$graph->img->SetMargin(80,30,30,40); +$graph->SetScale('textint'); +$graph->SetShadow(); +$graph->SetFrame(false); // No border around the graph + +// Add some grace to the top so that the scale doesn't +// end exactly at the max value. +// The grace value is the percetage of additional scale +// value we add. Specifying 50 means that we add 50% of the +// max value +$graph->yaxis->scale->SetGrace(50); +$graph->yaxis->SetLabelFormatCallback('separator1000'); + +// Setup X-axis labels +$a = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($a); +$graph->xaxis->SetFont(FF_FONT2); + +// Setup graph title ands fonts +$graph->title->Set('Example of Y-scale callback formatting'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->xaxis->title->Set('Year 2002'); +$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor('orange'); +$bplot->SetWidth(0.5); +$bplot->SetShadow(); + +// Setup the values that are displayed on top of each bar +$bplot->value->Show(); + +// Must use TTF fonts if we want text at an arbitrary angle +$bplot->value->SetFont(FF_ARIAL,FS_BOLD); +$bplot->value->SetAngle(45); +$bplot->value->SetFormatCallback('separator1000_usd'); + +// Black color for positive values and darkred for negative values +$bplot->value->SetColor('black','darkred'); +$graph->Add($bplot); + +// Finally stroke the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex12.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex12.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex12.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex12.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,89 @@ +clearTheme(); +$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME); +$graph->SetShadow(); + +// Use text X-scale so we can text labels on the X-axis +$graph->SetScale("textlin"); + +// Y2-axis is linear +$graph->SetY2Scale("lin"); + +// Color the two Y-axis to make them easier to associate +// to the corresponding plot (we keep the axis black though) +$graph->yaxis->SetColor("black","red"); +$graph->y2axis->SetColor("black","orange"); + +// Set title and subtitle +$graph->title->Set("Combined bar and line plot"); +$graph->subtitle->Set("100 data points, X-Scale: 'text'"); + +// Use built in font (don't need TTF support) +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Make the margin around the plot a little bit bigger then default +$graph->img->SetMargin(40,140,40,80); + +// Slightly adjust the legend from it's default position in the +// top right corner to middle right side +$graph->legend->Pos(0.03,0.5,"right","center"); + +// Display every 6:th tickmark +$graph->xaxis->SetTextTickInterval(6); + +// Label every 2:nd tick mark +$graph->xaxis->SetTextLabelInterval(2); + +// Setup the labels +$graph->xaxis->SetTickLabels($databarx); +$graph->xaxis->SetLabelAngle(90); + +// Create a red line plot +$p1 = new LinePlot($datay); +$p1->SetColor("red"); +$p1->SetLegend("Pressure"); + +// Create the bar plot +$b1 = new BarPlot($databary); +$b1->SetLegend("Temperature"); +$b1->SetFillColor("orange"); +$b1->SetAbsWidth(8); + +// Drop shadow on bars adjust the default values a little bit +$b1->SetShadow("steelblue",2,2); + +// The order the plots are added determines who's ontop +$graph->Add($p1); +$graph->AddY2($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +clearTheme(); +$graph->SetShadow(); + +// Use a "text" X-scale +$graph->SetScale("textlin"); + +// Set title and subtitle +$graph->title->Set("Elementary barplot with a text scale"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create the bar plot +$b1 = new BarPlot($databary); +$b1->SetLegend("Temperature"); +//$b1->SetAbsWidth(6); +//$b1->SetShadow(); + +// The order the plots are added determines who's ontop +$graph->Add($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +GetShortMonth(); + +// New graph with a drop shadow +$graph = new Graph(300,200,'auto'); +$graph->clearTheme(); +$graph->SetShadow(); + +// Use a "text" X-scale +$graph->SetScale("textlin"); + +// Specify X-labels +$graph->xaxis->SetTickLabels($months); + +// Set title and subtitle +$graph->title->Set("Textscale with specified labels"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create the bar plot +$b1 = new BarPlot($databary); +$b1->SetLegend("Temperature"); + +//$b1->SetAbsWidth(6); +//$b1->SetShadow(); + +// The order the plots are added determines who's ontop +$graph->Add($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,43 @@ +GetShortMonth(); + +srand ((double) microtime() * 1000000); +for( $i=0; $i<25; ++$i) { + $databary[]=rand(1,50); + $databarx[]=$months[$i%12]; +} + +// New graph with a drop shadow +$graph = new Graph(300,200,'auto'); +$graph->clearTheme(); +$graph->SetShadow(); + +// Use a "text" X-scale +$graph->SetScale("textlin"); + +// Specify X-labels +$graph->xaxis->SetTickLabels($databarx); + +// Set title and subtitle +$graph->title->Set("Bar tutorial example 3"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create the bar plot +$b1 = new BarPlot($databary); +$b1->SetLegend("Temperature"); +//$b1->SetAbsWidth(6); +//$b1->SetShadow(); + +// The order the plots are added determines who's ontop +$graph->Add($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +GetShortMonth(); + +srand ((double) microtime() * 1000000); +for( $i=0; $i<25; ++$i) { + $databary[]=rand(1,50); + $databarx[]=$months[$i%12]; +} + +// New graph with a drop shadow +$graph = new Graph(300,200,'auto'); +$graph->clearTheme(); +$graph->SetShadow(); + +// Use a "text" X-scale +$graph->SetScale("textlin"); + +// Specify X-labels +//$databarx = array('tXi','','','xxx','','','iXii','','','OOO','','','tOO'); +$graph->xaxis->SetFont(FF_FONT1,FS_NORMAL); +$graph->xaxis->SetTickLabels($databarx); +$graph->xaxis->SetTextLabelInterval(3); + +// Set title and subtitle +$graph->title->Set("Displaying only every third label"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create the bar plot +$b1 = new BarPlot($databary); +$b1->SetLegend("Temperature"); +//$b1->SetAbsWidth(6); +//$b1->SetShadow(); + +// The order the plots are added determines who's ontop +$graph->Add($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,44 @@ +GetShortMonth(); + +srand ((double) microtime() * 1000000); +for( $i=0; $i<25; ++$i) { + $databary[]=rand(1,50); + $databarx[]=$months[$i%12]; +} + +// New graph with a drop shadow +$graph = new Graph(300,200,'auto'); +$graph->clearTheme(); +$graph->SetShadow(); + +// Use a "text" X-scale +$graph->SetScale("textlin"); + +// Specify X-labels +$graph->xaxis->SetTickLabels($databarx); +$graph->xaxis->SetTextLabelInterval(1); +$graph->xaxis->SetTextTickInterval(3); + +// Set title and subtitle +$graph->title->Set("Bar tutorial example 5"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create the bar plot +$b1 = new BarPlot($databary); +$b1->SetLegend("Temperature"); +$b1->SetWidth(0.4); + +// The order the plots are added determines who's ontop +$graph->Add($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bartutex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +GetShortMonth(); +srand ((double) microtime() * 1000000); +for( $i=0; $i<25; ++$i) { + $databary[]=rand(1,50); + $databarx[]=$months[$i%12]; +} + +// New graph with a drop shadow +$graph = new Graph(300,200,'auto'); +$graph->clearTheme(); +$graph->SetShadow(); + +// Use a "text" X-scale +$graph->SetScale("textlin"); + +// Specify X-labels +$graph->xaxis->SetTickLabels($databarx); +$graph->xaxis->SetTextLabelInterval(3); + +// Hide the tick marks +$graph->xaxis->HideTicks(); + +// Set title and subtitle +$graph->title->Set("Bar tutorial example 6"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create the bar plot +$b1 = new BarPlot($databary); +$b1->SetLegend("Temperature"); +$b1->SetWidth(0.4); + + +// The order the plots are added determines who's ontop +$graph->Add($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +SetScale('intint'); + +// Adjust the margins to fit the margin +$graph->SetMargin(30,100,40,30); + +// Setup +$graph->title->Set('Basic contour plot'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// A simple contour plot with default arguments (e.g. 10 isobar lines) +$cp = new ContourPlot($data); + +// Display the legend +$cp->ShowLegend(); + +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,43 @@ +SetScale('intint'); + +// Show axis on all sides +$graph->SetAxisStyle(AXSTYLE_BOXOUT); + +// Adjust the margins to fit the margin +$graph->SetMargin(30,100,40,30); + +// Setup +$graph->title->Set('Basic contour plot with multiple axis'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// A simple contour plot with default arguments (e.g. 10 isobar lines) +$cp = new ContourPlot($data); + +// Display the legend +$cp->ShowLegend(); + +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +SetScale('intint'); + +// Show axis on all sides +$graph->SetAxisStyle(AXSTYLE_BOXOUT); + +// Adjust the margins to fit the margin +$graph->SetMargin(30,100,40,30); + +// Setup +$graph->title->Set('Basic contour plot with multiple axis'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// A simple contour plot with default arguments (e.g. 10 isobar lines) +$cp = new ContourPlot($data,10,1); + +// Display the legend +$cp->ShowLegend(); + +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +SetScale('intint'); + +// Show axis on all sides +$graph->SetAxisStyle(AXSTYLE_BOXOUT); + +// Adjust the margins to fit the margin +$graph->SetMargin(30,100,40,30); + +// Setup +$graph->title->Set('Basic contour plot with multiple axis'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// A simple contour plot with default arguments (e.g. 10 isobar lines) +$cp = new ContourPlot($data,10,2); + +// Display the legend +$cp->ShowLegend(); + +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex03-3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +SetScale('intint'); + +// Show axis on all sides +$graph->SetAxisStyle(AXSTYLE_BOXOUT); + +// Adjust the margins to fit the margin +$graph->SetMargin(30,100,40,30); + +// Setup +$graph->title->Set('Basic contour plot with multiple axis'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// A simple contour plot with default arguments (e.g. 10 isobar lines) +$cp = new ContourPlot($data,10,3); + +// Display the legend +$cp->ShowLegend(); + +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex04.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex04.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex04.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex04.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,43 @@ +SetScale('intint'); + +// Show axis on all sides +$graph->SetAxisStyle(AXSTYLE_BOXOUT); + +// Adjust the margins to fit the margin +$graph->SetMargin(30,100,40,30); + +// Setup +$graph->title->Set('Basic contour plot with multiple axis'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// A simple contour plot with default arguments (e.g. 10 isobar lines) +$cp = new ContourPlot($data,5); + +// Display the legend +$cp->ShowLegend(); + +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex05.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex05.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex05.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/basic_contourex05.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +SetScale('intint'); + +// Show axis on all sides +$graph->SetAxisStyle(AXSTYLE_BOXOUT); + +// Adjust the margins to fit the margin +$graph->SetMargin(30,100,40,30); + +// Setup +$graph->title->Set('Basic contour plot with multiple axis'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// A simple contour plot with default arguments (e.g. 10 isobar lines) +$cp = new ContourPlot($data); + +// Flip the data around its center line +$cp->SetInvert(); + +// Display the legend +$cp->ShowLegend(); + +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bezierex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bezierex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bezierex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bezierex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,54 @@ +Get(50); + +// Create the graph +$g = new Graph(300,200); +$g->clearTheme(); +$g->SetMargin(30,20,40,30); +$g->title->Set("Bezier interpolation"); +$g->title->SetFont(FF_ARIAL,FS_NORMAL,12); +$g->subtitle->Set('(Control points shown in red)'); +$g->subtitle->SetColor('darkred'); +$g->SetMarginColor('lightblue'); + +//$g->img->SetAntiAliasing(); + +// We need a linlin scale since we provide both +// x and y coordinates for the data points. +$g->SetScale('linlin'); + +// We want 1 decimal for the X-label +$g->xaxis->SetLabelFormat('%1.1f'); + +// We use a scatterplot to illustrate the original +// contro points. +$bplot = new ScatterPlot($ydata,$xdata); +$bplot->mark->SetFillColor('red@0.3'); +$bplot->mark->SetColor('red@0.5'); + +// And a line plot to stroke the smooth curve we got +// from the original control points +$lplot = new LinePlot($newy,$newx); +$lplot->SetColor('navy'); + +// Add the plots to the graph and stroke +$g->Add($lplot); +$g->Add($bplot); +$g->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,79 @@ +clearTheme(); +$graph->SetScale('textlin'); +$graph->SetMargin(40,20,20,40); +$graph->SetMarginColor('white:0.9'); +$graph->SetColor('white'); +$graph->SetShadow(); + +// Adjust the position of the legend box +$graph->legend->Pos(0.03,0.10); + +// Adjust the color for theshadow of the legend +$graph->legend->SetShadow('darkgray@0.5'); +$graph->legend->SetFillColor('lightblue@0.1'); +$graph->legend->Hide(); + +// Get localised version of the month names +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); +$graph->SetBackgroundCountryFlag('mais',BGIMG_COPY,50); + +// Set axis titles and fonts +$graph->xaxis->title->Set('Year 2002'); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetColor('white'); + +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->SetColor('navy'); + +$graph->yaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->SetColor('navy'); + +//$graph->ygrid->Show(false); +$graph->ygrid->SetColor('white@0.5'); + +// Setup graph title +$graph->title->Set('Using a country flag background'); + +// Some extra margin (from the top) +$graph->title->SetMargin(3); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12); + +// Create the three var series we will combine +$bplot1 = new BarPlot($datay1); +$bplot2 = new BarPlot($datay2); +$bplot3 = new BarPlot($datay3); + +// Setup the colors with 40% transparency (alpha channel) +$bplot1->SetFillColor('yellow@0.4'); +$bplot2->SetFillColor('red@0.4'); +$bplot3->SetFillColor('darkgreen@0.4'); + +// Setup legends +$bplot1->SetLegend('Label 1'); +$bplot2->SetLegend('Label 2'); +$bplot3->SetLegend('Label 3'); + +// Setup each bar with a shadow of 50% transparency +$bplot1->SetShadow('black@0.4'); +$bplot2->SetShadow('black@0.4'); +$bplot3->SetShadow('black@0.4'); + +$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3)); +$gbarplot->SetWidth(0.6); +$graph->Add($gbarplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,83 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMargin(40,20,20,40); +$graph->SetMarginColor('white:0.9'); +$graph->SetColor('white'); +$graph->SetShadow(); + +// Apply a perspective transformation at the end +$graph->Set3DPerspective(SKEW3D_UP,100,180); + +// Adjust the position of the legend box +$graph->legend->Pos(0.03,0.10); + +// Adjust the color for theshadow of the legend +$graph->legend->SetShadow('darkgray@0.5'); +$graph->legend->SetFillColor('lightblue@0.1'); +$graph->legend->Hide(); + +// Get localised version of the month names +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +$graph->SetBackgroundCountryFlag('mais',BGIMG_COPY,50); + +// Set axis titles and fonts +$graph->xaxis->title->Set('Year 2002'); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetColor('white'); + +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->SetColor('navy'); + +$graph->yaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->SetColor('navy'); + +//$graph->ygrid->Show(false); +$graph->ygrid->SetColor('white@0.5'); + +// Setup graph title +$graph->title->Set('Using a country flag background'); + +// Some extra margin (from the top) +$graph->title->SetMargin(3); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12); + +// Create the three var series we will combine +$bplot1 = new BarPlot($datay1); +$bplot2 = new BarPlot($datay2); +$bplot3 = new BarPlot($datay3); + +// Setup the colors with 40% transparency (alpha channel) +$bplot1->SetFillColor('yellow@0.4'); +$bplot2->SetFillColor('red@0.4'); +$bplot3->SetFillColor('darkgreen@0.4'); + +// Setup legends +$bplot1->SetLegend('Label 1'); +$bplot2->SetLegend('Label 2'); +$bplot3->SetLegend('Label 3'); + +// Setup each bar with a shadow of 50% transparency +$bplot1->SetShadow('black@0.4'); +$bplot2->SetShadow('black@0.4'); +$bplot3->SetShadow('black@0.4'); + +$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3)); +$gbarplot->SetWidth(0.6); +$graph->Add($gbarplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,83 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMargin(40,20,20,40); +$graph->SetMarginColor('white:0.9'); +$graph->SetColor('white'); +$graph->SetShadow(); + +// Apply a perspective transformation at the end +$graph->Set3DPerspective(SKEW3D_DOWN,100,180); + +// Adjust the position of the legend box +$graph->legend->Pos(0.03,0.10); + +// Adjust the color for theshadow of the legend +$graph->legend->SetShadow('darkgray@0.5'); +$graph->legend->SetFillColor('lightblue@0.1'); +$graph->legend->Hide(); + +// Get localised version of the month names +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +$graph->SetBackgroundCountryFlag('mais',BGIMG_COPY,50); + +// Set axis titles and fonts +$graph->xaxis->title->Set('Year 2002'); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetColor('white'); + +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->SetColor('navy'); + +$graph->yaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->SetColor('navy'); + +//$graph->ygrid->Show(false); +$graph->ygrid->SetColor('white@0.5'); + +// Setup graph title +$graph->title->Set('Using a country flag background'); + +// Some extra margin (from the top) +$graph->title->SetMargin(3); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12); + +// Create the three var series we will combine +$bplot1 = new BarPlot($datay1); +$bplot2 = new BarPlot($datay2); +$bplot3 = new BarPlot($datay3); + +// Setup the colors with 40% transparency (alpha channel) +$bplot1->SetFillColor('yellow@0.4'); +$bplot2->SetFillColor('red@0.4'); +$bplot3->SetFillColor('darkgreen@0.4'); + +// Setup legends +$bplot1->SetLegend('Label 1'); +$bplot2->SetLegend('Label 2'); +$bplot3->SetLegend('Label 3'); + +// Setup each bar with a shadow of 50% transparency +$bplot1->SetShadow('black@0.4'); +$bplot2->SetShadow('black@0.4'); +$bplot3->SetShadow('black@0.4'); + +$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3)); +$gbarplot->SetWidth(0.6); +$graph->Add($gbarplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,83 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMargin(40,20,20,40); +$graph->SetMarginColor('white:0.9'); +$graph->SetColor('white'); +$graph->SetShadow(); + +// Apply a perspective transformation at the end +$graph->Set3DPerspective(SKEW3D_LEFT,350,320,true); + +// Adjust the position of the legend box +$graph->legend->Pos(0.03,0.10); + +// Adjust the color for theshadow of the legend +$graph->legend->SetShadow('darkgray@0.5'); +$graph->legend->SetFillColor('lightblue@0.1'); +$graph->legend->Hide(); + +// Get localised version of the month names +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +$graph->SetBackgroundCountryFlag('mais',BGIMG_COPY,50); + +// Set axis titles and fonts +$graph->xaxis->title->Set('Year 2002'); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetColor('white'); + +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->SetColor('navy'); + +$graph->yaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->SetColor('navy'); + +//$graph->ygrid->Show(false); +$graph->ygrid->SetColor('white@0.5'); + +// Setup graph title +$graph->title->Set('Using a country flag background'); + +// Some extra margin (from the top) +$graph->title->SetMargin(3); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12); + +// Create the three var series we will combine +$bplot1 = new BarPlot($datay1); +$bplot2 = new BarPlot($datay2); +$bplot3 = new BarPlot($datay3); + +// Setup the colors with 40% transparency (alpha channel) +$bplot1->SetFillColor('yellow@0.4'); +$bplot2->SetFillColor('red@0.4'); +$bplot3->SetFillColor('darkgreen@0.4'); + +// Setup legends +$bplot1->SetLegend('Label 1'); +$bplot2->SetLegend('Label 2'); +$bplot3->SetLegend('Label 3'); + +// Setup each bar with a shadow of 50% transparency +$bplot1->SetShadow('black@0.4'); +$bplot2->SetShadow('black@0.4'); +$bplot3->SetShadow('black@0.4'); + +$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3)); +$gbarplot->SetWidth(0.6); +$graph->Add($gbarplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/bkgimgflagex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,83 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMargin(40,20,20,40); +$graph->SetMarginColor('white:0.9'); +$graph->SetColor('white'); +$graph->SetShadow(); + +// Apply a perspective transformation at the end +$graph->Set3DPerspective(SKEW3D_RIGHT,350,320,true); + +// Adjust the position of the legend box +$graph->legend->Pos(0.03,0.10); + +// Adjust the color for theshadow of the legend +$graph->legend->SetShadow('darkgray@0.5'); +$graph->legend->SetFillColor('lightblue@0.1'); +$graph->legend->Hide(); + +// Get localised version of the month names +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +$graph->SetBackgroundCountryFlag('mais',BGIMG_COPY,50); + +// Set axis titles and fonts +$graph->xaxis->title->Set('Year 2002'); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetColor('white'); + +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->SetColor('navy'); + +$graph->yaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->SetColor('navy'); + +//$graph->ygrid->Show(false); +$graph->ygrid->SetColor('white@0.5'); + +// Setup graph title +$graph->title->Set('Using a country flag background'); + +// Some extra margin (from the top) +$graph->title->SetMargin(3); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12); + +// Create the three var series we will combine +$bplot1 = new BarPlot($datay1); +$bplot2 = new BarPlot($datay2); +$bplot3 = new BarPlot($datay3); + +// Setup the colors with 40% transparency (alpha channel) +$bplot1->SetFillColor('yellow@0.4'); +$bplot2->SetFillColor('red@0.4'); +$bplot3->SetFillColor('darkgreen@0.4'); + +// Setup legends +$bplot1->SetLegend('Label 1'); +$bplot2->SetLegend('Label 2'); +$bplot3->SetLegend('Label 3'); + +// Setup each bar with a shadow of 50% transparency +$bplot1->SetShadow('black@0.4'); +$bplot2->SetShadow('black@0.4'); +$bplot3->SetShadow('black@0.4'); + +$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3)); +$gbarplot->SetWidth(0.6); +$graph->Add($gbarplot); + +$graph->Stroke(); +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/blueblack400x300grad.png and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/blueblack400x300grad.png differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockcsimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockcsimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockcsimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockcsimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +SetScale("textlin"); +$graph->SetMarginColor('lightblue'); +$graph->title->Set('Box Stock chart example'); + +// Create a new stock plot +$p1 = new BoxPlot($datay); + +// Setup URL target for image map +$p1->SetCSIMTargets(array('#1','#2','#3','#4','#5')); + +// Width of the bars (in pixels) +$p1->SetWidth(9); + +//$p1->SetCenter(); +// Uncomment the following line to hide the horizontal end lines +//$p1->HideEndLines(); + +// Add the plot to the graph and send it back to the browser +$graph->Add($p1); +$graph->StrokeCSIM(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +clearTheme(); +$graph->SetScale('textlin'); +$graph->SetMarginColor('lightblue'); +$graph->title->Set('Box Stock chart example'); + +// Create a new stock plot +$p1 = new BoxPlot($datay); + +// Width of the bars (in pixels) +$p1->SetWidth(9); + +// Uncomment the following line to hide the horizontal end lines +//$p1->HideEndLines(); + +// Add the plot to the graph and send it back to the browser +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/boxstockex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMarginColor('lightblue'); +$graph->title->Set('Box Stock chart example'); +$graph->subtitle->Set('(Indented X-axis)'); + +// Create a new stock plot +$p1 = new BoxPlot($datay); + +// Width of the bars (in pixels) +$p1->SetWidth(9); + +// Indent bars so they dont start and end at the edge of the +// plot area +$p1->SetCenter(); + +// Uncomment the following line to hide the horizontal end lines +//$p1->HideEndLines(); + +// Add the plot to the graph and send it back to the browser +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/builtinplotmarksex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/builtinplotmarksex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/builtinplotmarksex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/builtinplotmarksex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,66 @@ +SetMargin(30,20,60,20); +$graph->SetMarginColor('white'); +$graph->SetScale("linlin"); + +// Hide the frame around the graph +$graph->SetFrame(false); + +// Setup title +$graph->title->Set("Using Builtin PlotMarks"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); + +// Note: requires jpgraph 1.12p or higher +// $graph->SetBackgroundGradient('blue','navy:0.5',GRAD_HOR,BGRAD_PLOT); +$graph->tabtitle->Set('Region 1' ); +$graph->tabtitle->SetWidth(TABTITLE_WIDTHFULL); + +// Enable X and Y Grid +$graph->xgrid->Show(); +$graph->xgrid->SetColor('gray@0.5'); +$graph->ygrid->SetColor('gray@0.5'); + +// Format the legend box +$graph->legend->SetColor('navy'); +$graph->legend->SetFillColor('lightgreen'); +$graph->legend->SetLineWeight(1); +$graph->legend->SetFont(FF_ARIAL,FS_BOLD,8); +$graph->legend->SetShadow('gray@0.4',3); +$graph->legend->SetAbsPos(15,120,'right','bottom'); + +// Create the line plots + +$p1 = new LinePlot($datay1); +$p1->SetColor("red"); +$p1->SetFillColor("yellow@0.5"); +$p1->SetWeight(2); +$p1->mark->SetType(MARK_IMG_DIAMOND,5,0.6); +$p1->SetLegend('2006'); +$graph->Add($p1); + +$p2 = new LinePlot($datay2); +$p2->SetColor("darkgreen"); +$p2->SetWeight(2); +$p2->SetLegend('2001'); +$p2->mark->SetType(MARK_IMG_MBALL,'red'); +$graph->Add($p2); + +// Add a vertical line at the end scale position '7' +$l1 = new PlotLine(VERTICAL,7); +$graph->Add($l1); + +// Output the graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasbezierex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasbezierex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasbezierex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasbezierex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +title->Set('Bezier line with control points'); + +// Setup control point for bezier +$p = array(3,6, + 6,9, + 5,3, + 7,4); + +// Visualize control points +$shape->SetColor('blue'); +$shape->Line($p[0],$p[1],$p[2],$p[3]); +$shape->FilledCircle($p[2],$p[3],-6); + +$shape->SetColor('red'); +$shape->Line($p[4],$p[5],$p[6],$p[7]); +$shape->FilledCircle($p[4],$p[5],-6); + +// Draw bezier +$shape->SetColor('black'); +$shape->Bezier($p); + +// Frame it with a square +$shape->SetColor('navy'); +$shape->Rectangle(0.5,2,9.5,9.5); + +// ... and stroke it +$g->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +SetMargin(5,11,6,11); +$g->SetShadow(); +$g->SetMarginColor("teal"); + +// We need to stroke the plotarea and margin before we add the +// text since we otherwise would overwrite the text. +$g->InitFrame(); + +// Draw a text box in the middle +$txt="This\nis\na TEXT!!!"; +$t = new Text($txt,200,10); +$t->SetFont(FF_ARIAL,FS_BOLD,40); + +// How should the text box interpret the coordinates? +$t->Align('center','top'); + +// How should the paragraph be aligned? +$t->ParagraphAlign('center'); + +// Add a box around the text, white fill, black border and gray shadow +$t->SetBox("white","black","gray"); + +// Stroke the text +$t->Stroke($g->img); + +// Stroke the graph +$g->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetMargin(5,11,6,11); +$g->SetShadow(); +$g->SetMarginColor("teal"); + +// We need to stroke the plotarea and margin before we add the +// text since we otherwise would overwrite the text. +$g->InitFrame(); + +// Add a black line +$g->img->SetColor('black'); +$g->img->Line(0,0,100,100); + +// .. and a circle (x,y,diameter) +$g->img->Circle(100,100,50); + +// .. and a filled circle (x,y,diameter) +$g->img->SetColor('red'); +$g->img->FilledCircle(200,100,50); + +// .. add a rectangle +$g->img->SetColor('green'); +$g->img->FilledRectangle(10,10,50,50); + +// .. add a filled rounded rectangle +$g->img->SetColor('green'); +$g->img->FilledRoundedRectangle(300,30,350,80,10); +// .. with a darker border +$g->img->SetColor('darkgreen'); +$g->img->RoundedRectangle(300,30,350,80,10); + +// Stroke the graph +$g->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ +SetMargin(5,11,6,11); +$g->SetShadow(); +$g->SetMarginColor("teal"); + +// We need to stroke the plotarea and margin before we add the +// text since we otherwise would overwrite the text. +$g->InitFrame(); + +// Create a new scale +$scale = new CanvasScale($g); +$scale->Set(0,$xmax,0,$ymax); + +// The shape class is wrapper around the Imgae class which translates +// the coordinates for us +$shape = new Shape($g,$scale); +$shape->SetColor('black'); + + +// Add a black line +$shape->SetColor('black'); +$shape->Line(0,0,20,20); + +// .. and a circle (x,y,diameter) +$shape->Circle(5,14,2); + +// .. and a filled circle (x,y,diameter) +$shape->SetColor('red'); +$shape->FilledCircle(11,8,3); + +// .. add a rectangle +$shape->SetColor('green'); +$shape->FilledRectangle(15,8,19,14); + +// .. add a filled rounded rectangle +$shape->SetColor('green'); +$shape->FilledRoundedRectangle(2,3,8,6); +// .. with a darker border +$shape->SetColor('darkgreen'); +$shape->RoundedRectangle(2,3,8,6); + + +// Stroke the graph +$g->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex04.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex04.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex04.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex04.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ +SetMargin(5,11,6,11); +$g->SetShadow(); +$g->SetMarginColor("teal"); + +// We need to stroke the plotarea and margin before we add the +// text since we otherwise would overwrite the text. +$g->InitFrame(); + +// Create a new scale +$scale = new CanvasScale($g); +$scale->Set(0,$xmax,0,$ymax); + +// The shape class is wrapper around the Imgae class which translates +// the coordinates for us +$shape = new Shape($g,$scale); +$shape->SetColor('black'); + + +// Add a black line +$shape->SetColor('black'); +$shape->Line(0,0,20,20); + +// .. and a circle (x,y,diameter) +$shape->Circle(5,14,2); + +// .. and a filled circle (x,y,diameter) +$shape->SetColor('red'); +$shape->FilledCircle(11,8,3); + +// .. add a rectangle +$shape->SetColor('green'); +$shape->FilledRectangle(15,8,19,14); + +// .. add a filled rounded rectangle +$shape->SetColor('green'); +$shape->FilledRoundedRectangle(2,3,8,6); +// .. with a darker border +$shape->SetColor('darkgreen'); +$shape->RoundedRectangle(2,3,8,6); + + +// Stroke the graph +$g->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex05.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex05.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex05.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex05.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ +SetMargin(5,11,6,11); +$g->SetShadow(); +$g->SetMarginColor("teal"); + +// We need to stroke the plotarea and margin before we add the +// text since we otherwise would overwrite the text. +$g->InitFrame(); + +// Create a new scale +$scale = new CanvasScale($g); +$scale->Set(0,$xmax,0,$ymax); + +// The shape class is wrapper around the Imgae class which translates +// the coordinates for us +$shape = new Shape($g,$scale); +$shape->SetColor('black'); + + +// Add a black line +$shape->SetColor('black'); +$shape->Line(0,0,20,20); + +// .. and a circle (x,y,diameter) +$shape->Circle(5,14,2); + +// .. and a filled circle (x,y,diameter) +$shape->SetColor('red'); +$shape->FilledCircle(11,8,3); + +// .. add a rectangle +$shape->SetColor('green'); +$shape->FilledRectangle(15,8,19,14); + +// .. add a filled rounded rectangle +$shape->SetColor('green'); +$shape->FilledRoundedRectangle(2,3,8,6); +// .. with a darker border +$shape->SetColor('darkgreen'); +$shape->RoundedRectangle(2,3,8,6); + + +// Stroke the graph +$g->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex06.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex06.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex06.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvasex06.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetMargin(5,11,6,11); +$g->SetShadow(); +$g->SetMarginColor("teal"); + +// We need to stroke the plotarea and margin before we add the +// text since we otherwise would overwrite the text. +$g->InitFrame(); + +// Create a new scale +$scale = new CanvasScale($g); +$scale->Set(0,$xmax,0,$ymax); + +// The shape class is wrapper around the Imgae class which translates +// the coordinates for us +$shape = new Shape($g,$scale); +$shape->SetColor('black'); + +$shape->IndentedRectangle(1,2,15,15,8,8,CORNER_TOPLEFT,'khaki'); + +$shape->IndentedRectangle(1,20,15,15,8,8,CORNER_BOTTOMLEFT,'khaki'); + +$shape->IndentedRectangle(20,2,15,15,8,8,CORNER_TOPRIGHT,'khaki'); + +$shape->IndentedRectangle(20,20,15,15,8,8,CORNER_BOTTOMRIGHT,'khaki'); + +// Stroke the graph +$g->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvas_jpgarchex.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvas_jpgarchex.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvas_jpgarchex.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvas_jpgarchex.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,143 @@ +SetMargin(2,3,2,3); +$g->SetMarginColor("teal"); +$g->InitFrame(); + +// ... and a scale +$scale = new CanvasScale($g); +$scale->Set(0,$xmax,0,$ymax); + +// ... we need shape since we want the indented rectangle +$shape = new Shape($g,$scale); +$shape->SetColor('black'); + +// ... basic parameters for the overall image +$l = 2; // Left margin +$r = 18; // Row number to start the lowest line on +$width = 16; // Total width + +// Setup the two basic rectangle text object we will use +$tt = new CanvasRectangleText(); +$tt->SetFont(FF_ARIAL,FS_NORMAL,14); +$tt->SetFillColor(''); +$tt->SetColor(''); +$tt->SetFontColor('navy'); + +$t = new CanvasRectangleText(); +$t->SetFont(FF_ARIAL,FS_NORMAL,14); +$t->SetFillColor('goldenrod1'); +$t->SetFontColor('navy'); + + +// Now start drawing the arch overview from the bottom and up +// This is all pretty manual and one day I will write a proper +// framework to make it easy to construct these types of architecture +// overviews. But for now, just plain old coordinates.. + +// Line: GD Library and image libraries +$h=3; +$s = 3; $d=$l + $width-9; +$t->SetFillColor('cadetblue3'); +$t->Set("TTF",$d,$r+2,$s,1); +$t->Stroke($g->img,$scale); +$t->Set("PNG",$d+$s,$r+2,$s,1); +$t->Stroke($g->img,$scale); +$t->Set("JPEG",$d+2*$s,$r+2,$s,1); +$t->Stroke($g->img,$scale); +$shape->IndentedRectangle($l,$r,$width,$h,$s*3,1,2,'lightgreen'); +$tt->Set("GD Basic library\n(1.8.x or 2.x)",$l,$r,$width,$h-1); +$tt->Stroke($g->img,$scale); + + +// Area: Basic internal JpGraph architecture +$t->SetFillColor('goldenrod1'); +$h = 2; +$r -= $h; $d=8; +$t->Set("Image primitives\n(RGB, Anti-aliasing,\nGD Abstraction)",$l,$r-0.5,$width*0.5,$h+0.5); +$t->Stroke($g->img,$scale); +$t->Set("Image Cache &\nStreaming",$l+0.5*$width,$r,$width*0.4,$h); +$t->Stroke($g->img,$scale); + +$r -= $h; $d=8; +$t->Set("2D Rot & Transformation",$l,$r,$width*0.5,$h-0.5); $t->Stroke($g->img,$scale); + + +$r -= 2; $h = 4; +$shape->IndentedRectangle($l,$r,$width*0.9,$h,$d,2,3,'goldenrod1'); +$tt->Set("Axis, Labelling, (Auto)-Scaling",$l,$r,$width*0.9,$h-2); $tt->Stroke($g->img,$scale); + +$r -= 1; +$shape->IndentedRectangle($l,$r,$width,7,$width*0.9,6,3,'goldenrod1'); +$tt->Set("Error handling & Utility classes",$l,$r,$width,1); $tt->Stroke($g->img,$scale); + + +// Area: Top area with graph components +$t->SetFillColor('gold1'); +$r -= 3; +$w = $width*0.55/4; $h = 2; +$t->Set("Gantt\nGraph",$l,$r,$w,$h); +$t->Stroke($g->img,$scale); + +$t->Set("Pie\nGraph",$l+$w,$r,$w,$h); +$t->Stroke($g->img,$scale); +$t->Set("Radar\nGraph",$l+$w*2,$r,$w,$h); +$t->Stroke($g->img,$scale); + +$shape->IndentedRectangle($l,$r,$width,3,4*$w,2,0,'gold1'); +$tt->Set("Base Graph\n(Orthogonal\ncoordinate system)",$l+4*$w,$r,$width-$w*4,3); +$tt->Stroke($g->img,$scale); + +$r -= 2; +$d = 0.7; +$shape->IndentedRectangle($l+3*$w,$r,$w,4, $w*$d,2,0,'gold1'); +$t->Set("Canv\nUtil",$l+3*$w,$r,$w*$d,$h); $t->Stroke($g->img,$scale); +$tt->Set("Canvas\nGraph",$l+3*$w,$r+2,$w,2); $tt->Stroke($g->img,$scale); + +// Top line of plotting plugins +$t->SetFillColor('cyan'); +$t->Set("Gantt\nPlot",$l,$r,$w,$h); $t->Stroke($g->img,$scale); +$t->Set("2D\nPlot",$l+$w,$r,$w/2,$h); $t->Stroke($g->img,$scale); +$t->Set("3D\nPlot",$l+$w+$w/2,$r,$w/2,$h);$t->Stroke($g->img,$scale); +$t->Set("Radar\nPlot",$l+2*$w,$r,$w,$h); $t->Stroke($g->img,$scale); + +$wp = ($width - 4*$w)/4; +$t->Set("Error\nPlot",$l+4*$w,$r,$wp,$h); $t->Stroke($g->img,$scale); +$t->Set("Line\nPlot",$l+4*$w+$wp,$r,$wp,$h); $t->Stroke($g->img,$scale); +$t->Set("Bar\nPlot",$l+4*$w+2*$wp,$r,$wp,$h); $t->Stroke($g->img,$scale); +$t->Set("Scatter\nPlot",$l+4*$w+3*$wp,$r,$wp,$h); $t->Stroke($g->img,$scale); + +// Show application top +$r -= 2.5; $h=2; +$t->SetFillColor('blue'); +$t->SetFontColor('white'); +$t->SetFont(FF_ARIAL,FS_BOLD,20); +$t->Set("PHP Application",$l,$r,$width,$h); $t->Stroke($g->img,$scale); + +// Stroke title +$r = 0.5; +$tt->SetFontColor('black'); +$tt->SetFont(FF_TIMES,FS_BOLD,28); +$tt->Set("JpGraph Architecture Overview",$l,$r,$width,1); +$tt->Stroke($g->img,$scale); + +// Stroke footer +$tt->SetFont(FF_VERDANA,FS_NORMAL,10); +$tt->Set("Generated: ".date("ymd H:m",time()),0.1,$ymax*0.95); +$tt->Stroke($g->img,$scale); + +// .. and stream it all back +$g->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvaspiralex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvaspiralex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/canvaspiralex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/canvaspiralex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,78 @@ +SetColor($color1); + $img->Line($x,$y,$x+$s1*$w,$y); + } + else { + $x = $x + $s2*$w*$r; + $w = (1-$r)*$w; + $h = $h / (1-$r) * $r; + $s2 *= -1; + $img->SetColor($color1); + $img->Line($x,$y,$x,$y-$s2*$h); + } + $img->SetColor($color2); + $img->FilledRectangle($x-1,$y-1,$x+1,$y+1); + $img->Arc($x,$y,2*$w+1,2*$h+1,$sa,$ea); + $img->Arc($x,$y,2*$w,2*$h,$sa,$ea); + $img->Arc($x,$y,2*$w-1,2*$h-1,$sa,$ea); + $img->Line($x_old,$y_old,$x,$y); + $x_old=$x; $y_old=$y; + } +} + +$g = new CanvasGraph($w,$h); +//$gr = 1.61803398874989484820; + +$p = SeaShell($g->img,0,20,$w-1,$h-21,$r,19); +$g->img->SetColor('black'); +$g->img->Rectangle(0,20,$w-1,$h-1); +$g->img->SetFont(FF_FONT2,FS_BOLD); +$g->img->SetTextAlign('center','top'); +$g->img->StrokeText($w/2,0,"Canvas Spiral"); + +$g->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ccbp_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ccbp_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ccbp_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ccbp_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +SetTitle('Buffer penetration','(history added)'); +$graph->SetColorMap(0); + + // Two "fake tasks with hostory +$datax=array(75,83); $datay=array(110,64); +$datax1 = array(33,50,67,83); $datay1 = array(86,76,80,64); +$datax2 = array(18,47,58,75); $datay2 = array(80,97,105,110); + +$sp = new ScatterPlot($datay,$datax); +$sp->mark->SetType(MARK_DIAMOND); +$sp->mark->SetFillColor('white'); +$sp->mark->SetSize(12); + +$sp_hist = array(); +$sp_hist[0] = new LinePlot($datay1,$datax1); +$sp_hist[0]->SetWeight(1); +$sp_hist[0]->SetColor('white'); + +$sp_hist[1] = new LinePlot($datay2,$datax2); +$sp_hist[1]->SetWeight(1); +$sp_hist[1]->SetColor('white'); + +$graph->Add($sp_hist); +$graph->Add($sp); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ccbp_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ccbp_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ccbp_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ccbp_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +SetTitle('Buffer penetration','(history added)'); +$graph->SetColorMap(1); + + // Two "fake tasks with hostory +$datax=array(75,83); $datay=array(110,64); +$datax1 = array(33,50,67,83); $datay1 = array(86,76,80,64); +$datax2 = array(18,47,58,75); $datay2 = array(80,97,105,110); + +$sp = new ScatterPlot($datay,$datax); +$sp->mark->SetType(MARK_DIAMOND); +$sp->mark->SetFillColor('white'); +$sp->mark->SetSize(12); + +$sp_hist = array(); +$sp_hist[0] = new LinePlot($datay1,$datax1); +$sp_hist[0]->SetWeight(1); +$sp_hist[0]->SetColor('white'); + +$sp_hist[1] = new LinePlot($datay2,$datax2); +$sp_hist[1]->SetWeight(1); +$sp_hist[1]->SetColor('white'); + +$graph->Add($sp_hist); +$graph->Add($sp); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ccbpgraph.class.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ccbpgraph.class.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ccbpgraph.class.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ccbpgraph.class.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,258 @@ +iWidth = $aWidth; + $this->iHeight = $aHeight; + } + /** + * Set the title and subtitle for the graph + * + * @param string $aTitle + * @param string $aSubTitle + */ + public function SetTitle($aTitle, $aSubTitle) { + $this->iTitle = $aTitle; + $this->iSubTitle = $aSubTitle; + } + /** + * Set the x-axis min and max values + * + * @param int $aMin + * @param int $aMax + */ + public function SetXMinMax($aMin, $aMax) { + $this->iXMin = floor($aMin/CCBPGraph::TickStep)*CCBPGraph::TickStep; + $this->iXMax = ceil($aMax/CCBPGraph::TickStep)*CCBPGraph::TickStep; + } + /** + * Specify what color map to use + * + * @param int $aMap + */ + public function SetColorMap($aMap) { + $this->iColorMap = $aMap % CCBPGraph::NColorMaps; + } + /** + * Set the y-axis min and max values + * + * @param int $aMin + * @param int $aMax + */ + public function SetYMinMax($aMin,$aMax) { + $this->iYMin = floor($aMin/CCBPGraph::TickStep)*CCBPGraph::TickStep; + $this->iYMax = ceil($aMax/CCBPGraph::TickStep)*CCBPGraph::TickStep; + } + /** + * Set the specification of the color backgrounds and also the + * optional exact colors to be used + * + * @param mixed $aSpec An array of 3 1x2 arrays. Each array specify the + * color indication value at x=0 and x=max x in order to determine the slope + * @param mixed $aColors An array with four elements specifying the colors + * of each color indicator + */ + public function SetColorIndication(array $aSpec,array $aColors=null) { + if( count($aSpec) !== 3 ) { + JpgraphError::Raise('Specification of scale values for background indicators must be an array with three elements.'); + } + $this->iColorInd = $aSpec; + if( $aColors !== null ) { + if( is_array($aColors) && count($aColors) == 4 ) { + $this->iColorSpec = $aColors; + } + else { + JpGraphError::Raise('Color specification for background indication must have four colors.'); + } + } + } + /** + * Construct the graph + * + */ + private function Init() { + + // Setup limits for color indications + $lowx = $this->iXMin; $highx= $this->iXMax; + $lowy = $this->iYMin; $highy = $this->iYMax; + $width=$this->iWidth; $height=$this->iHeight; + + // Margins + $lm=50; $rm=40; + $tm=60; $bm=40; + + if( $width <= 300 || $height <= 250 ) { + $labelsize = 8; + $lm=25; $rm=25; + $tm=45; $bm=25; + } + elseif( $width <= 450 || $height <= 300 ) { + $labelsize = 8; + $lm=30; $rm=30; + $tm=50; $bm=30; + } + elseif( $width <= 600 || $height <= 400 ) { + $labelsize = 9; + } + else { + $labelsize = 11; + } + + if( $this->iSubTitle == '' ) { + $tm -= $labelsize+4; + } + + $graph = new Graph($width,$height); + $graph->clearTheme(); + $graph->SetScale('intint',$lowy,$highy,$lowx,$highx); + $graph->SetMargin($lm,$rm,$tm,$bm); + $graph->SetMarginColor($this->iMarginColor[$this->iColorMap]); + $graph->SetClipping(); + + $graph->title->Set($this->iTitle); + $graph->subtitle->Set($this->iSubTitle); + + $graph->title->SetFont(FF_ARIAL,FS_BOLD,$labelsize+4); + $graph->subtitle->SetFont(FF_ARIAL,FS_BOLD,$labelsize+1); + + $graph->SetBox(true,'black@0.3'); + + $graph->xaxis->SetFont(FF_ARIAL,FS_BOLD,$labelsize); + $graph->yaxis->SetFont(FF_ARIAL,FS_BOLD,$labelsize); + + $graph->xaxis->scale->ticks->Set(CCBPGraph::TickStep,CCBPGraph::TickStep); + $graph->yaxis->scale->ticks->Set(CCBPGraph::TickStep,CCBPGraph::TickStep); + + $graph->xaxis->HideZeroLabel(); + $graph->yaxis->HideZeroLabel(); + + $graph->xaxis->SetLabelFormatString('%d%%'); + $graph->yaxis->SetLabelFormatString('%d%%'); + + // For the x-axis we adjust the color so labels on the left of the Y-axis are in black + $n1 = floor(abs($this->iXMin/25))+1; + $n2 = floor($this->iXMax/25); + if( $this->iColorMap == 0 ) { + $xlcolors=array(); + for( $i = 0; $i < $n1; ++$i ) { + $xlcolors[$i] = 'black'; + } + for( $i = 0; $i < $n2; ++$i ) { + $xlcolors[$n1+$i] = 'lightgray:1.5'; + } + $graph->xaxis->SetColor('gray',$xlcolors); + $graph->yaxis->SetColor('gray','lightgray:1.5'); + } + else { + $graph->xaxis->SetColor('darkgray','darkgray:0.8'); + $graph->yaxis->SetColor('darkgray','darkgray:0.8'); + } + $graph->SetGridDepth(DEPTH_FRONT); + $graph->ygrid->SetColor('gray@0.6'); + $graph->ygrid->SetLineStyle('dotted'); + + $graph->ygrid->Show(); + + $graph->xaxis->SetWeight(1); + $graph->yaxis->SetWeight(1); + + $ytitle = new Text(CCBPGraph::YTitle,floor($lm*.75),($height-$tm-$bm)/2+$tm); + #$ytitle->SetFont(FF_VERA,FS_BOLD,$labelsize+1); + $ytitle->SetAlign('right','center'); + $ytitle->SetAngle(90); + $graph->Add($ytitle); + + $xtitle = new Text(CCBPGraph::XTitle,($width-$lm-$rm)/2+$lm,$height - 10); + #$xtitle->SetFont(FF_VERA,FS_BOLD,$labelsize); + $xtitle->SetAlign('center','bottom'); + $graph->Add($xtitle); + + $df = 'D j:S M, Y'; + if( $width < 400 ) { + $df = 'D j:S M'; + } + + $time = new Text(date($df),$width-10,$height-10); + $time->SetAlign('right','bottom'); + #$time->SetFont(FF_VERA,FS_NORMAL,$labelsize-1); + $time->SetColor('darkgray'); + $graph->Add($time); + + // Use an accumulated fille line graph to create the colored bands + + $n = 3; + for( $i=0; $i < $n; ++$i ) { + $b = $this->iColorInd[$i][0]; + $k = ($this->iColorInd[$i][1] - $this->iColorInd[$i][0])/$this->iXMax; + $colarea[$i] = array( array($lowx,$lowx*$k+$b), array($highx,$highx*$k+$b) ); + } + $colarea[3] = array( array($lowx,$highy), array($highx,$highy) ); + + + $cb = array(); + for( $i=0; $i < 4; ++$i ) { + $cb[$i] = new LinePlot(array($colarea[$i][0][1],$colarea[$i][1][1]), + array($colarea[$i][0][0],$colarea[$i][1][0])); + $cb[$i]->SetFillColor($this->iColorSpec[$this->iColorMap][$i]); + $cb[$i]->SetFillFromYMin(); + } + + $graph->Add(array_slice(array_reverse($cb),0,4)); + $this->graph = $graph; + } + /** + * Add a line or scatter plot to the graph + * + * @param mixed $aPlots + */ + public function Add($aPlots) { + if( is_array($aPlots) ) { + $this->iPlots = array_merge($this->iPlots,$aPlots); + } + else { + $this->iPlots[] = $aPlots; + } + } + /** + * Stroke the graph back to the client or to a file + * + * @param mixed $aFile + */ + public function Stroke($aFile='') { + $this->Init(); + if( count($this->iPlots) > 0 ) { + $this->graph->Add($this->iPlots); + } + $this->graph->Stroke($aFile); + } +} +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,35 @@ +img->SetMargin(40,40,40,40); +$graph->img->SetAntiAliasing(); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->title->Set("Example of line centered plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + + +// Use 20% "grace" to get slightly larger scale then min/max of +// data +$graph->yscale->SetGrace(20); + + +$p1 = new LinePlot($datay); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$p1->SetColor("blue"); +$p1->SetCenter(); +$graph->Add($p1); + +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +img->SetMargin(40,40,40,40); +$graph->img->SetAntiAliasing(); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->title->Set("Example of filled line centered plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new LinePlot($datay); +$p1->SetFillColor("green"); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$p1->SetColor("blue"); +$p1->SetCenter(); +$graph->Add($p1); + +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/centeredlineex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,31 @@ +img->SetMargin(40,40,40,80); +$graph->img->SetAntiAliasing(); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->title->Set("Example slanted X-labels"); +$graph->title->SetFont(FF_VERDANA,FS_NORMAL,14); + +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,11); +$graph->xaxis->SetTickLabels($labels); +$graph->xaxis->SetLabelAngle(45); + +$p1 = new LinePlot($datay); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$p1->SetColor("blue"); +$p1->SetCenter(); +$graph->Add($p1); + +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/centerlinebarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/centerlinebarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/centerlinebarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/centerlinebarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +clearTheme(); +$graph->img->SetMargin(40,80,40,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +$graph->title->Set('Center the line points in bars'); + +$line = new LinePlot($ydata); +$line->SetBarCenter(); +$line->SetWeight(2); + +$bar = new BarPlot($ydata); +$bar2 = new BarPlot($ydata); +$bar2->SetFillColor("red"); + +$gbar = new GroupbarPlot(array($bar,$bar2)); + +$graph->Add($gbar); +$graph->Add($line); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/checkgd2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/checkgd2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/checkgd2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/checkgd2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,14 @@ + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/checkgd.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/checkgd.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/checkgd.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/checkgd.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,11 @@ + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/checkttf.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/checkttf.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/checkttf.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/checkttf.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,22 @@ + Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/classroom.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/classroom.jpg differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/clipping_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/clipping_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/clipping_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/clipping_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +clearTheme(); +$graph->SetScale('intlin',0,10); +$graph->SetMargin(30,20,70,40); +$graph->SetMarginColor(array(177,191,174)); + +$graph->SetClipping(false); + +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); + +$graph->ygrid->SetLineStyle('dashed'); + +$graph->title->Set("Manual scale"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->title->SetColor('white'); +$graph->subtitle->Set("(No clipping)"); +$graph->subtitle->SetColor('white'); +$graph->subtitle->SetFont(FF_ARIAL,FS_BOLD,10); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor("red"); +$lineplot->SetWeight(2); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/clipping_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/clipping_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/clipping_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/clipping_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +clearTheme(); +$graph->SetScale('intlin',0,10); +$graph->SetMargin(30,20,70,40); +$graph->SetMarginColor(array(177,191,174)); + +$graph->SetClipping(true); + +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); + +$graph->ygrid->SetLineStyle('dashed'); + +$graph->title->Set("Manual scale"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->title->SetColor('white'); +$graph->subtitle->Set("(With clipping)"); +$graph->subtitle->SetColor('white'); +$graph->subtitle->SetFont(FF_ARIAL,FS_BOLD,10); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor("red"); +$lineplot->SetWeight(2); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/colormaps.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/colormaps.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/colormaps.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/colormaps.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,133 @@ +img->SetColor('darkgray'); + $graph->img->Rectangle(0,0,$width-1,$height-1); + + $t = new Text($aTitle, $width/2,5); + $t->SetAlign('center','top'); + $t->SetFont(FF_ARIAL,FS_BOLD,14); + $t->Stroke($graph->img); + + // Instantiate a colormap + $cm = new ColorMap(); + $cm->InitRGB($graph->img->rgb); + + for( $mapidx=$aStart; $mapidx <= $aEnd; ++$mapidx, $ys += $ymarg ) { + + $cm->SetMap($mapidx,$aReverse); + $n = $cm->SetNumColors($n); + list( $mapidx, $maparray ) = $cm->GetCurrMap(); + $ncols = count($maparray); + $colbuckets = $cm->GetBuckets(); + + // The module width will depend on the actual number of colors + $mw = round(($width-$lmarg-$rmarg)/$n); + + // Draw color map title (name) + $t->Set('Basic colors: '.$ncols.', Total colors: '.$n); + $t->SetAlign('center','bottom'); + $t->SetAngle(0); + $t->SetFont(FF_TIMES,FS_NORMAL,14); + $t->Stroke($graph->img,$width/2,$ys-3); + + // Add the name/number of the map to the left + $t->SetAlign('right','center'); + $t->Set('Map: '.$mapidx); + $t->SetFont(FF_ARIAL,FS_NORMAL,14); + $t->Stroke($graph->img,$xs-20,round($ys+$mh/2)); + + // Setup text properties for the color names + if( $addColorNames ) { + $t->SetAngle(30); + $t->SetFont(FF_ARIAL,FS_NORMAL,12); + $t->SetAlign('right','top'); + } + + // Loop through all colors in the map + $x = $xs; $y = $ys; $k=0; + for($i=0; $i < $n; ++$i){ + $graph->img->SetColor($colbuckets[$i]); + $graph->img->FilledRectangle($x,$y,$x+$mw,$y+$mh); + + // Mark all basic colors in the map with a bar and name + if( $i % (($n-$ncols)/($ncols-1)+1) == 0 ) { + $graph->img->SetColor('black'); + $graph->img->FilledRectangle($x,$y+$mh+4,$x+$mw-1,$y+$mh+6); + if( $addColorNames ) { + $t->Set($maparray[$k++]); + $t->Stroke($graph->img,$x+$mw/2,$y+$mh+10); + } + } + $x += $mw; + } + + // Draw a border around the map + $graph->img->SetColor('black'); + $graph->img->Rectangle($xs,$ys,$xs+$mw*$n,$ys+$mh); + + } + + // Send back to client + $graph->Stroke(); + } + +} + +$driver = new ColorMapDriver(); + +$title = "Standard maps"; +$reverse = false; +$n = 64; $s=0; $e=9; +$showNames = false; + + +/* +$title = "Center maps"; +$reverse = false; +$n = 64; $s=10; $e=14; +$showNames = false; +*/ + +/* +$title = "Continues maps"; +$reverse = false; +$n = 64; $s=15; $e=21; +$showNames = false; +*/ +$driver->Draw($title,$s,$e,$n,$reverse,$showNames); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,98 @@ + 359) + $data_winddirection[$i+1] = 0; + + $data_windspeed[$i+1] = $data_windspeed[$i] + rand(-2,2); + if($data_windspeed[$i+1] < 0 ) + $data_windspeed[$i+1] = 0; + + $xdata[$i] = $start + $i * SAMPLERATE; +} +$xdata[$i] = $start + $i * SAMPLERATE; + + +// Setup the Wind direction graph +$graph = new Graph(300,800); +$graph->clearTheme(); +$graph->SetMarginColor('lightgray:1.7'); +$graph->SetScale('datlin',0,360); +$graph->Set90AndMargin(50,30,60,30); +$graph->SetFrame(true,'white',0); +$graph->SetBox(); + +$graph->title->Set('Wind direction'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->title->SetMargin(10); + +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->xaxis->scale->SetDateFormat('h:i'); +$graph->xgrid->Show(); + +$graph->yaxis->SetLabelAngle(45); +$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->yaxis->SetLabelMargin(0); +$graph->yaxis->scale->SetAutoMin(0); + +$line = new LinePlot($data_winddirection,$xdata); +$line->SetStepStyle(); +$line->SetColor('blue'); + +$graph->Add($line); + +// Setup the wind speed graph +$graph2 = new Graph(300,800); +$graph2->clearTheme(); +$graph2->SetScale('datlin'); +$graph2->Set90AndMargin(50,30,60,30); +$graph2->SetMarginColor('lightgray:1.7'); +$graph2->SetFrame(true,'white',0); +$graph2->SetBox(); + +$graph2->title->Set('Windspeed'); +$graph2->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph2->title->SetMargin(10); + +$graph2->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph2->xaxis->scale->SetDateFormat('h:i'); +$graph2->xgrid->Show(); + +$graph2->yaxis->SetLabelAngle(45); +$graph2->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph2->yaxis->SetLabelMargin(0); +$graph2->yaxis->scale->SetAutoMin(0); + +$line2 = new LinePlot($data_windspeed,$xdata); +$line2->SetStepStyle(); +$line2->SetColor('red'); + +$graph2->Add($line2); + +//----------------------- +// Create a multigraph +//---------------------- +$mgraph = new MGraph(); +$mgraph->SetMargin(2,2,2,2); +$mgraph->SetFrame(true,'darkgray',2); +$mgraph->SetFillColor('lightgray'); +$mgraph->Add($graph); +$mgraph->Add($graph2,300,0); +$mgraph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,105 @@ + 359) + $data_winddirection[$i+1] = 0; + + $data_windspeed[$i+1] = $data_windspeed[$i] + rand(-2,2); + if($data_windspeed[$i+1] < 0 ) + $data_windspeed[$i+1] = 0; + + $xdata[$i] = $start + $i * SAMPLERATE; +} +$xdata[$i] = $start + $i * SAMPLERATE; + + +DEFINE('BKG_COLOR','lightgray:1.7'); +DEFINE('WIND_HEIGHT',800); +DEFINE('WIND_WIDTH',280); + +// Setup the Wind direction graph +$graph = new Graph(WIND_WIDTH,WIND_HEIGHT); +$graph->clearTheme(); +$graph->SetMarginColor(BKG_COLOR); +$graph->SetScale('datlin',0,360); +$graph->Set90AndMargin(50,10,60,30); +$graph->SetFrame(true,'white',0); +$graph->SetBox(); + +$graph->title->Set('Wind direction'); +$graph->title->SetColor('blue'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->title->SetMargin(5); + +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->xaxis->scale->SetDateFormat('h:i'); +$graph->xgrid->Show(); + +$graph->yaxis->SetLabelAngle(90); +$graph->yaxis->SetColor('blue'); +$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->yaxis->SetLabelMargin(0); +$graph->yaxis->scale->SetAutoMin(0); + +$line = new LinePlot($data_winddirection,$xdata); +$line->SetStepStyle(); +$line->SetColor('blue'); + +$graph->Add($line); + +// Setup the wind speed graph +$graph2 = new Graph(WIND_WIDTH-30,WIND_HEIGHT); +$graph2->clearTheme(); +$graph2->SetScale('datlin'); +$graph2->Set90AndMargin(5,20,60,30); +$graph2->SetMarginColor(BKG_COLOR); +$graph2->SetFrame(true,'white',0); +$graph2->SetBox(); + +$graph2->title->Set('Windspeed'); +$graph2->title->SetColor('red'); +$graph2->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph2->title->SetMargin(5); + +$graph2->xaxis->HideLabels(); +$graph2->xgrid->Show(); + +$graph2->yaxis->SetLabelAngle(90); +$graph2->yaxis->SetColor('red'); +$graph2->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph2->yaxis->SetLabelMargin(0); +$graph2->yaxis->scale->SetAutoMin(0); + +$line2 = new LinePlot($data_windspeed,$xdata); +$line2->SetStepStyle(); +$line2->SetColor('red'); + +$graph2->Add($line2); + +//----------------------- +// Create a multigraph +//---------------------- +$mgraph = new MGraph(); +$mgraph->SetMargin(2,2,2,2); +$mgraph->SetFrame(true,'darkgray',2); +$mgraph->SetFillColor(BKG_COLOR); +$mgraph->Add($graph); +$mgraph->Add($graph2,280,0); +$mgraph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/comb90dategraphex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,150 @@ + 359) + $data_winddirection[$i+1] = 0; + + $data_windspeed[$i+1] = $data_windspeed[$i] + rand(-2,2); + if($data_windspeed[$i+1] < 0 ) + $data_windspeed[$i+1] = 0; + + $data_windtemp[$i+1] = $data_windtemp[$i] + rand(-1.5,1.5); + + $xdata[$i] = $start + $i * SAMPLERATE; +} +$xdata[$i] = $start + $i * SAMPLERATE; + + +//DEFINE('BKG_COLOR','lightgray:1.7'); +DEFINE('BKG_COLOR','green:1.98'); +DEFINE('WIND_HEIGHT',800); +DEFINE('WIND_WIDTH',250); + +//------------------------------------------------------------------ +// Setup the Wind direction graph +//------------------------------------------------------------------ +$graph = new Graph(WIND_WIDTH,WIND_HEIGHT); +$graph->clearTheme(); +$graph->SetMarginColor(BKG_COLOR); +$graph->SetScale('datlin',0,360); +$graph->Set90AndMargin(50,10,70,30); +$graph->SetFrame(true,'white',0); +$graph->SetBox(); + +$graph->title->Set('Wind direction'); +$graph->title->SetColor('blue'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->title->SetMargin(5); + +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->xaxis->scale->SetDateFormat('H:i'); +$graph->xgrid->Show(); + +$graph->yaxis->SetLabelAngle(90); +$graph->yaxis->SetColor('blue'); +$graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph->yaxis->SetLabelMargin(0); +$graph->yaxis->scale->SetAutoMin(0); + +$line = new LinePlot($data_winddirection,$xdata); +$line->SetStepStyle(); +$line->SetColor('blue'); + +$graph->Add($line); + +//------------------------------------------------------------------ +// Setup the wind speed graph +//------------------------------------------------------------------ +$graph2 = new Graph(WIND_WIDTH-30,WIND_HEIGHT); +$graph2->clearTheme(); +$graph2->SetScale('datlin'); +$graph2->Set90AndMargin(5,20,70,30); +$graph2->SetMarginColor(BKG_COLOR); +$graph2->SetFrame(true,'white',0); +$graph2->SetBox(); + +$graph2->title->Set('Windspeed'); +$graph2->title->SetColor('red'); +$graph2->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph2->title->SetMargin(5); + +$graph2->xaxis->HideLabels(); +$graph2->xgrid->Show(); + +$graph2->yaxis->SetLabelAngle(90); +$graph2->yaxis->SetColor('red'); +$graph2->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph2->yaxis->SetLabelMargin(0); +$graph2->yaxis->scale->SetAutoMin(0); + +$line2 = new LinePlot($data_windspeed,$xdata); +$line2->SetStepStyle(); +$line2->SetColor('red'); + +$graph2->Add($line2); + +//------------------------------------------------------------------ +// Setup the wind temp graph +//------------------------------------------------------------------ +$graph3 = new Graph(WIND_WIDTH-30,WIND_HEIGHT); +$graph3->clearTheme(); +$graph3->SetScale('datlin'); +$graph3->Set90AndMargin(5,20,70,30); +$graph3->SetMarginColor(BKG_COLOR); +$graph3->SetFrame(true,'white',0); +$graph3->SetBox(); + +$graph3->title->Set('Temperature'); +$graph3->title->SetColor('black'); +$graph3->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph3->title->SetMargin(5); + +$graph3->xaxis->HideLabels(); +$graph3->xgrid->Show(); + +$graph3->yaxis->SetLabelAngle(90); +$graph3->yaxis->SetColor('black'); +$graph3->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); +$graph3->yaxis->SetLabelMargin(0); +$graph3->yaxis->scale->SetAutoMin(-10); + +$line3 = new LinePlot($data_windtemp,$xdata); +$line3->SetStepStyle(); +$line3->SetColor('black'); + +$graph3->Add($line3); + +//----------------------- +// Create a multigraph +//---------------------- +$mgraph = new MGraph(); +$mgraph->SetMargin(2,2,2,2); +$mgraph->SetFrame(true,'darkgray',2); +$mgraph->SetFillColor(BKG_COLOR); +$mgraph->Add($graph,0,50); +$mgraph->Add($graph2,250,50); +$mgraph->Add($graph3,460,50); +$mgraph->title->Set('Climate diagram 12 March 2009'); +$mgraph->title->SetFont(FF_ARIAL,FS_BOLD,20); +$mgraph->title->SetMargin(8); +$mgraph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/combgraphex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/combgraphex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/combgraphex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/combgraphex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,89 @@ +getTicks($datax,DSUTILS_MONTH1); + +// Now create the real graph +// Combine a line and a bar graph + +// We add some grace to the end of the X-axis scale so that the first and last +// data point isn't exactly at the very end or beginning of the scale +$grace = 400000; +$xmin = $datax[0]-$grace; +$xmax = $datax[$n-1]+$grace;; + +// Overall width of graphs +$w = 450; +// Left and right margin for each graph +$lm=25; $rm=15; + +//---------------------- +// Setup the line graph +//---------------------- +$graph = new Graph($w,250); +$graph->SetScale('linlin',0,0,$xmin,$xmax); +$graph->SetMargin($lm,$rm,10,30); +$graph->SetMarginColor('white'); +$graph->SetFrame(false); +$graph->SetBox(true); +$graph->title->Set('Example of combined graph'); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,14); +$graph->xaxis->SetTickPositions($tickPositions,$minTickPositions); +$graph->xaxis->SetLabelFormatString('My',true); +$graph->xgrid->Show(); +$p1 = new LinePlot($datay,$datax); +$graph->Add($p1); + +//---------------------- +// Setup the bar graph +//---------------------- +$graph2 = new Graph($w,110); +$graph2->SetScale('linlin',0,0,$xmin,$xmax); +$graph2->SetMargin($lm,$rm,5,10); +$graph2->SetMarginColor('white'); +$graph2->SetFrame(false); +$graph2->SetBox(true); +$graph2->xgrid->Show(); +$graph2->xaxis->SetTickPositions($tickPositions,$minTickPositions); +$graph2->xaxis->SetLabelFormatString('My',true); +$graph2->xaxis->SetPos('max'); +$graph2->xaxis->HideLabels(); +$graph2->xaxis->SetTickSide(SIDE_DOWN); +$b1 = new BarPlot($datay2,$datax); +$b1->SetFillColor('teal'); +$b1->SetColor('teal:1.2'); +$graph2->Add($b1); + +//----------------------- +// Create a multigraph +//---------------------- +$mgraph = new MGraph(); +$mgraph->SetMargin(2,2,2,2); +$mgraph->SetFrame(true,'darkgray',2); +$mgraph->Add($graph); +$mgraph->Add($graph2,0,240); +$mgraph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/combgraphex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/combgraphex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/combgraphex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/combgraphex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,90 @@ +SetScale('linlin',0,0,$xmin,$xmax); +$graph->SetMargin($lm,$rm,10,30); +$graph->SetMarginColor('white'); +$graph->SetFrame(false); +$graph->SetBox(true); +$graph->title->Set('Example of combined graph with background'); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,14); +$graph->xaxis->SetTickPositions($tickPositions,$minTickPositions); +$graph->xaxis->SetLabelFormatString('My',true); +$graph->xgrid->Show(); +$p1 = new LinePlot($datay,$datax); +$graph->Add($p1); + +//---------------------- +// Setup the bar graph +//---------------------- +$graph2 = new Graph($w,110); +$graph2->SetScale('linlin',0,0,$xmin,$xmax); +$graph2->SetMargin($lm,$rm,5,10); +$graph2->SetMarginColor('white'); +$graph2->SetFrame(false); +$graph2->SetBox(true); +$graph2->xgrid->Show(); +$graph2->xaxis->SetTickPositions($tickPositions,$minTickPositions); +$graph2->xaxis->SetLabelFormatString('My',true); +$graph2->xaxis->SetPos('max'); +$graph2->xaxis->HideLabels(); +$graph2->xaxis->SetTickSide(SIDE_DOWN); +$b1 = new BarPlot($datay2,$datax); +$b1->SetFillColor('teal'); +$b1->SetColor('teal:1.2'); +$graph2->Add($b1); + +//----------------------- +// Create a multigraph +//---------------------- +$mgraph = new MGraph(); +$mgraph->SetImgFormat('jpeg',60); +$mgraph->SetMargin(2,2,2,2); +$mgraph->SetFrame(true,'darkgray',2); +$mgraph->SetBackgroundImage('tiger1.jpg'); +$mgraph->AddMix($graph,0,0,85); +$mgraph->AddMix($graph2,0,250,85); +$mgraph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +SetMargin(30, 30, 40, 30); +$graph->SetScale('intint'); +$graph->SetMarginColor('white'); + +// Setup title of graph +$graph->title->Set('Filled contour plot'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); + +$graph->subtitle->Set('(With lines and labels)'); +$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10); + +// Create a new contour plot +$cp = new FilledContourPlot($data); + +// Use only blue/red color schema +$cp->UseHighContrastColor(true); + +// Flip visually +$cp->SetInvert(); + +// Fill the contours +$cp->SetFilled(true); + +// Display the labels +$cp->ShowLabels(true,true); +$cp->SetFont(FF_ARIAL,FS_BOLD,9); +$cp->SetFontColor('white'); + +// And add the plot to the graph +$graph->Add($cp); + +// Send it back to the client +$graph->stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +SetMargin(30, 30, 40, 30); +$graph->SetScale('intint'); +$graph->SetMarginColor('white'); + +// Setup title of graph +$graph->title->Set('Filled contour plot'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); + +$graph->subtitle->Set('(No lines, no labels)'); +$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10); + +// Create a new contour plot +$cp = new FilledContourPlot($data); + +// Use only blue/red color schema +$cp->UseHighContrastColor(true); + +// Flip visually +$cp->SetInvert(); + +// Fill the contours +$cp->SetFilled(true); + +// No labels +$cp->ShowLabels(false); + +// No lines +$cp->ShowLines(false); + +// And add the plot to the graph +$graph->Add($cp); + +// Send it back to the client +$graph->stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,55 @@ +SetMargin(30, 30, 40, 30); +$graph->SetScale('intint'); +$graph->SetMarginColor('white'); + +// Setup title of graph +$graph->title->Set('Filled contour plot'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); + +$graph->subtitle->Set('(Manual colors)'); +$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10); + +// Create a new contour plot with only 3 isobars +$cp = new FilledContourPlot($data,3); + +// Specify the colors manually +$isobar_colors = array('lightgray','teal:1.3','orange','red'); +$cp->SetIsobarColors($isobar_colors); + +// Use only blue/red color schema +$cp->UseHighContrastColor(true); + +// Flip visually +$cp->SetInvert(); + +// Fill the contours +$cp->SetFilled(true); + +// Display labels +$cp->ShowLabels(true); + +// No lines +$cp->ShowLines(false); + +// And add the plot to the graph +$graph->Add($cp); + +// Send it back to the client +$graph->stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,47 @@ +SetMargin(30, 30, 40, 30); +$graph->SetScale('intint'); +$graph->SetMarginColor('white'); + +// Setup title of graph +$graph->title->Set('Filled contour plot'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); + +$graph->subtitle->Set('(labels follows gradients)'); +$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10); + +// Create a new contour plot +$cp = new FilledContourPlot($data,8); + +// Flip visually +$cp->SetInvert(); + +// Fill the contours +$cp->SetFilled(true); + +// Display the labels +$cp->ShowLabels(true,true); +$cp->SetFont(FF_ARIAL,FS_BOLD,9); +$cp->SetFontColor('black'); + +// And add the plot to the graph +$graph->Add($cp); + +// Send it back to the client +$graph->stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,52 @@ +SetMargin(30, 30, 40, 30); +$graph->SetScale('intint'); +$graph->SetMarginColor('white'); + +// Setup title of graph +$graph->title->Set('Filled contour plot'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); + +$graph->subtitle->Set('(horizontal labels)'); +$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10); + +// Create a new contour plot +$cp = new FilledContourPlot($data,8); + +// Use only black/and white schema +$cp->UseHighContrastColor(true,true); + +// Flip visually +$cp->SetInvert(); + +// Fill the contours +$cp->SetFilled(true); +// Show lines in red +$cp->ShowLines(true,'red'); + +// Display the labels +$cp->ShowLabels(true,false); +$cp->SetFont(FF_ARIAL,FS_BOLD,9); +$cp->SetFontColor('white'); + +// And add the plot to the graph +$graph->Add($cp); + +// Send it back to the client +$graph->stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +SetMargin(30, 30, 40, 30); +$graph->SetScale('intint'); +$graph->SetMarginColor('white'); + +// Setup title of graph +$graph->title->Set('Filled contour plot'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); + +$graph->subtitle->Set('(With lines and labels)'); +$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10); + +// Create a new contour plot +$cp = new FilledContourPlot($data,7); + +// Use only blue/red color schema +$cp->UseHighContrastColor(true); + +// Flip visually +$cp->SetInvert(); + +// Fill the contours +$cp->SetFilled(true); + +// Specify method to use +$cp->SetMethod('rect'); + +// Display the labels +$cp->ShowLabels(true,true); +$cp->SetFont(FF_ARIAL,FS_BOLD,9); +$cp->SetFontColor('white'); + +// And add the plot to the graph +$graph->Add($cp); + +// Send it back to the client +$graph->stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contour2_ex7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +SetMargin(30, 30, 40, 30); +$graph->SetScale('intint'); +$graph->SetMarginColor('white'); + +// Setup title of graph +$graph->title->Set('Filled contour plot'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); + +$graph->subtitle->Set('(With lines and labels)'); +$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10); + +// Create a new contour plot +$cp = new FilledContourPlot($data,7); + +// Use only blue/red color schema +$cp->UseHighContrastColor(true); + +// Flip visually +$cp->SetInvert(); + +// Fill the contours +$cp->SetFilled(true); + +// Specify method to use +$cp->SetMethod('tri'); + +// Display the labels +$cp->ShowLabels(true,true); +$cp->SetFont(FF_ARIAL,FS_BOLD,9); +$cp->SetFontColor('white'); + +// And add the plot to the graph +$graph->Add($cp); + +// Send it back to the client +$graph->stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contourex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contourex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contourex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contourex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +SetMargin(40,140,60,40); + +$graph->title->Set('Example of contour plot'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +// For contour plots it is custom to use a box style ofr the axis +$graph->legend->SetPos(0.05,0.5,'right','center'); +$graph->SetScale('intint'); +$graph->SetAxisStyle(AXSTYLE_BOXOUT); +$graph->xgrid->Show(); +$graph->ygrid->Show(); + + +// A simple contour plot with default arguments (e.g. 10 isobar lines) +$cp = new ContourPlot($data); + +// Display the legend +$cp->ShowLegend(); + +// Make the isobar lines slightly thicker +$cp->SetLineWeight(2); +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contourex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contourex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contourex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contourex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetMargin(40,140,60,40); + +$graph->title->Set("Example of contour plot"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +// For contour plots it is custom to use a box style ofr the axis +$graph->legend->SetPos(0.05,0.5,'right','center'); +$graph->SetScale('intint'); +$graph->SetAxisStyle(AXSTYLE_BOXOUT); +$graph->xgrid->Show(); +$graph->ygrid->Show(); + + +// A simple contour plot with 12 isobar lines and flipped Y-coordinates +$cp = new ContourPlot($data,12,true); + +// Display the legend +$cp->ShowLegend(); + +// Make the isobar lines slightly thicker +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contourex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contourex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contourex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contourex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +SetMargin(40,140,60,40); + +// Enable antialias. Note with antiaaliasing only line weight=1 is supported. +$graph->img->SetAntiAliasing(); + +$graph->title->Set("Example of contour plot"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +// For contour plots it is custom to use a box style ofr the axis +$graph->legend->SetPos(0.05,0.5,'right','center'); +$graph->SetScale('intint'); +$graph->SetAxisStyle(AXSTYLE_BOXOUT); +$graph->xgrid->Show(); +$graph->ygrid->Show(); + + +// A simple contour plot with 19 isobars and flipped vertical range +$cp = new ContourPlot($data,10,true); + +// Display the legend +$cp->ShowLegend(); + +// Invert the legend to th lowest isobar is on top +$cp->Invertlegend(); +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contourex04.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contourex04.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contourex04.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contourex04.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +SetMargin(40,140,60,40); + +$graph->title->Set("Example of interpolated contour plot"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->title->SetMargin(10); + +// For contour plots it is custom to use a box style ofr the axis +$graph->legend->SetPos(0.05,0.5,'right','center'); +$graph->SetScale('intint'); + +// Setup axis and grids +$graph->SetAxisStyle(AXSTYLE_BOXOUT); +$graph->xgrid->SetLineStyle('dashed'); +$graph->xgrid->Show(true); +$graph->ygrid->SetLineStyle('dashed'); +$graph->ygrid->Show(true); + +// A simple contour plot with 10 isobar lines and flipped Y-coordinates +// Make the data smoother by interpolate the original matrice by a factor of two +// which will make each grid cell half the original size +$cp = new ContourPlot($data,10, 2); + +$cp->UseHighContrastColor(true); + +// Display the legend +$cp->ShowLegend(); + +// Make the isobar lines slightly thicker +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contourex05.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contourex05.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/contourex05.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/contourex05.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,59 @@ +SetMargin(40,120,60,50); + +$graph->title->Set("Contour plot, high contrast color"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->SetMargin(10); + +// For contour plots it is custom to use a box style ofr the axis +$graph->SetScale('intint',0,56,0,56); + +// Setup axis and grids +$graph->SetAxisStyle(AXSTYLE_BOXOUT); +$graph->xgrid->Show(true); +$graph->ygrid->Show(true); + +// A simple contour plot with 10 isobar lines and flipped Y-coordinates +// Make the data smoother by interpolate the original matrice by a factor of two +// which will make each grid cell half the original size +$cp = new ContourPlot($data,10, 3); + +$cp->UseHighContrastColor(true); + +// Display the legend +$cp->ShowLegend(); + +// Make the isobar lines slightly thicker +$graph->Add($cp); + +// ... and send the graph back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,61 @@ + + + +GetHTMLImageMap($_mapname); +echo $imgmap; + +?> + +

This is an example page with CSIM graphs with arbitrary HTML text

+ +Clicked on bar: <none>'; +} +else { + echo 'Clicked on bar: '.$_GET['clickedon'].''; +} +echo '

'; +?> + +

First we need to get hold of the image map and include it in the HTML + page.

+

For this graph it is:

+'.htmlentities($imgmap).'';?> + + tag and rebuild the +$imgtag = $graph->GetCSIMImgHTML($_mapname,$_graphfilename); +?> +

The graph is then be displayed as shown in figure 1. With the following + created <img> tag:

+

+
+
+ + +

+ +
Figure 1. The included CSIM graph. +

+ + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,100 @@ + + + +GetHTMLImageMap($_mapname1); +$imgmap2 = $piegraph->GetHTMLImageMap($_mapname2); +echo $imgmap1; +echo $imgmap2; + +?> + +

This is an example page with CSIM graphs with arbitrary HTML text

+ +Clicked on bar: <none>'; +} +else { + echo 'Clicked on bar: '.$_GET['clickedon'].''; +} +echo '

'; +if( empty($_GET['pie_clickedon']) ) { + echo 'Clicked on pie slice: <none>'; +} +else { + echo 'Clicked on pie slice: '.$_GET['pie_clickedon'].''; +} +echo '

'; +?> + +

First we need to get hold of the image maps and include them in the HTML + page.

+

For these graphs the maps are:

+
'.htmlentities($imgmap1).'
'; +?> +

+and +

+
'.htmlentities($imgmap2).'
'; +?> + + tags for Figure 1 & 2 and rebuild the URL arguments +$imgtag1 = $graph->GetCSIMImgHTML($_mapname1,$_graphfilename1); +$imgtag2 = $piegraph->GetCSIMImgHTML($_mapname2,$_graphfilename2); +?> +

The graphs are then displayed as shown in figure 1 & 2. With the following + created <img> tags:

+
+
+
+ +

+Note: For the Pie the center is counted as the first slice. +

+ +

+ + + + +
+ +
Figure 1. The included Bar CSIM graph. +

+
+ +
Figure 2. The included Pie CSIM graph. +

+
+ + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_graph_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_graph_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_graph_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_graph_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +SetScale('textlin'); +$graph->SetMargin(50,80,20,40); + +// Create a bar pot +$bplot = new BarPlot($datay); + +$n = count($datay) ; // Number of bars + +global $_wrapperfilename; + +// Create targets for the image maps. One for each column +$targ = array(); $alt = array(); $wtarg = array(); +for( $i=0; $i < $n; ++$i ) { + $urlarg = 'clickedon='.($i+1); + $targ[] = $_wrapperfilename.'?'.$urlarg; + $alt[] = 'val=%d'; + $wtarg[] = ''; +} +$bplot->SetCSIMTargets($targ,$alt,$wtarg); + +$graph->Add($bplot); + +$graph->title->Set('Multiple Image maps'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->title->SetCSIMTarget('#45','Title for Bar','_blank'); + +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetCSIMTarget('#55','Y-axis title'); +$graph->yaxis->title->Set("Y-title"); + +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetCSIMTarget('#55','X-axis title'); +$graph->xaxis->title->Set("X-title"); + +// Send back the image when we are called from within the tag +$graph->StrokeCSIMImage(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_graph_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_graph_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_graph_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/csim_in_html_graph_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,75 @@ +SetFrame(false); + +// Setup title +$piegraph->title->Set("CSIM Center Pie plot"); +$piegraph->title->SetFont(FF_ARIAL,FS_BOLD,18); +$piegraph->title->SetMargin(8); // Add a little bit more margin from the top + +// Create the pie plot +$p1 = new PiePlotC($data); + +// Set the radius of pie (as fraction of image size) +$p1->SetSize(0.32); + +// Label font and color setup +$p1->value->SetFont(FF_ARIAL,FS_BOLD,11); +$p1->value->SetColor('white'); + +// Setup the title on the center circle +$p1->midtitle->Set("Distribution\n2008 H1"); +$p1->midtitle->SetFont(FF_ARIAL,FS_NORMAL,12); + +// Set color for mid circle +$p1->SetMidColor('yellow'); + +// Use percentage values in the legends values (This is also the default) +$p1->SetLabelType(PIE_VALUE_PER); + +// The label array values may have printf() formatting in them. The argument to the +// form,at string will be the value of the slice (either the percetage or absolute +// depending on what was specified in the SetLabelType() above. +$lbl = array("Jan\n%.1f%%","Feb\n%.1f%%","March\n%.1f%%", + "Apr\n%.1f%%","May\n%.1f%%","Jun\n%.1f%%"); +$p1->SetLabels($lbl); + +// Add drop shadow to slices +$p1->SetShadow(); + +// Explode all slices 15 pixels +$p1->ExplodeAll(15); + +// Setup the CSIM targets +global $_wrapperfilename; +$targ = array(); $alt = array(); $wtarg = array(); +for( $i=0; $i <= $n; ++$i ) { + $urlarg = 'pie_clickedon='.($i+1); + $targ[] = $_wrapperfilename.'?'.$urlarg; + $alt[] = 'val=%d'; + $wtarg[] = ''; +} +$p1->SetCSIMTargets($targ,$alt,$wtarg); +$p1->SetMidCSIM($targ[0],$alt[0],$wtarg[0]); + +// Add plot to pie graph +$piegraph->Add($p1); + +// Send back the image when we are called from within the tag +$piegraph->StrokeCSIMImage(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex00.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex00.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex00.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex00.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,9 @@ +Stroke($data); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,18 @@ +SetEncoding(ENCODING_ASCII); +$backend = DatamatrixBackendFactory::Create($encoder); + +// We increase the module width to 3 pixels +$backend->SetModuleWidth(3); + +try { + $backend->Stroke($data); +} catch (Exception $e) { + echo 'Datamatrix error: '.$e->GetMessage()."\n"; + exit(1); +} +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,18 @@ +SetModuleWidth(3); + +// Create the barcode from the given data string and write to output file +try { + $backend->Stroke($data); +} catch (Exception $e) { + $errstr = $e->GetMessage(); + echo "Datamatrix error message: $errstr\n"; +} + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +SetEncoding(ENCODING_BASE256); + +// Create the image backend (default) +$backend = DatamatrixBackendFactory::Create($encoder); +$backend->SetModuleWidth(3); + +try { + $backend->Stroke($data); +} catch (Exception $e) { + $errstr = $e->GetMessage(); + echo "Datamatrix error message: $errstr\n"; +} + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +SetEncoding(ENCODING_BASE256); + +// Create the image backend (default) +$backend = DatamatrixBackendFactory::Create($encoder); +$backend->SetModuleWidth(3); + +try { + $backend->Stroke($data); +} catch (Exception $e) { + $errstr = $e->GetMessage(); + echo "Datamatrix error message: $errstr\n"; +} + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,25 @@ +SetEncoding(ENCODING_TEXT); + +// Create the image backend (default) +$backend = DatamatrixBackendFactory::Create($encoder); +$backend->SetModuleWidth(3); + +// Adjust the Quiet zone +$backend->SetQuietZone(10); + +// Create the barcode from the given data string and write to output file +try { + $backend->Stroke($data); +} catch (Exception $e) { + $errstr = $e->GetMessage(); + echo "Datamatrix error message: $errstr\n"; +} + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +SetEncoding(ENCODING_TEXT); + +// Create the image backend (default) +$backend = DatamatrixBackendFactory::Create($encoder); + +// By default the module width is 2 pixel so we increase it a bit +$backend->SetModuleWidth(4); + +// Set Quiet zone +$backend->SetQuietZone(10); + +// Set other than default colors (one, zero, quiet zone/background) +$backend->SetColor('navy','white','lightgray'); + +// Create the barcode from the given data string and write to output file +try { + $backend->Stroke($data); +} catch (Exception $e) { + $errstr = $e->GetMessage(); + echo "Datamatrix error message: $errstr\n"; +} + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ +SetEncoding(ENCODING_TEXT); + +// Create the image backend (default) +$backend = DatamatrixBackendFactory::Create($encoder); +$backend->SetModuleWidth(5); +$backend->SetQuietZone(10); + +// Set other than default colors (one, zero, background) +$backend->SetColor('navy','white'); + +// Create the barcode from the given data string and write to output file +$dir = dirname(__FILE__); +$file = '"'.$dir.'/'.$outputfile.'"'; +try { + $backend->Stroke($data,$outputfile); + echo 'Barcode sucessfully written to file: '.$file; +} catch (Exception $e) { + $errstr = $e->GetMessage(); + $errcode = $e->GetCode(); + echo "Failed writing file: ".$file.'
'; + echo "Datamatrix error ($errcode). Message: $errstr\n"; +} + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datamatrix_ex7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,22 @@ +SetEncoding(ENCODING_BASE256); + +// Create the image backend (default) +$backend = DatamatrixBackendFactory::Create($encoder, BACKEND_ASCII); +$backend->SetModuleWidth(3); + +try { + $ps_txt = $backend->Stroke($data); + echo '

'.$ps_txt.'
'; +} catch (Exception $e) { + $errstr = $e->GetMessage(); + echo "Datamatrix error message: $errstr\n"; +} + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dataset01.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dataset01.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dataset01.inc.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dataset01.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,275 @@ + 1.0885908919277, 1 => + 0.99034385297982, 2 => 0.97005467188578, 3 => + 0.99901201350824, 4 => 1.1263167971152, 5 => + 1.0582808133448, 6 => 1.0216740689064, 7 => + 0.96626236356644, 8 => 1.0125912828768, 9 => + 0.99047473992496, 10 => 0.99102472104561, 11 => + 0.98500781573283, 12 => 0.91933668914198, 13 => + 0.92234602792711, 14 => 0.88933863410054, 15 => + 0.94236150975178, 16 => 0.98924287679116, 17 => + 1.0342765545566, 18 => 1.0538510278089, 19 => + 0.93496076181191, 20 => 0.90944479677235, 21 => + 0.80831866316983, 22 => 0.81912434615535, 23 => + 0.83143770042109, 24 => 0.86972168159496, 25 => + 0.92645774571577, 26 => 0.81169120061422, 27 => + 0.84409853057606, 28 => 0.89065856249272, 29 => + 0.83551478929348, 30 => 0.87015680306726, 31 => + 0.76063327042172, 32 => 0.82720958380697, 33 => + 0.86565279505723, 34 => 0.77858966246836, 35 => + 0.81009606378237, 36 => 0.80485136798149, 37 => + 0.82641461943804, 38 => 0.87442020676513, 39 => + 0.89589150146825, 40 => 0.92082995956816, 41 => + 0.92614241931726, 42 => 0.96915564652581, 43 => + 1.003753706293, 44 => 0.97438809368023, 45 => + 1.011556766867, 46 => 1.0785692014115, 47 => + 1.0586915420364, 48 => 1.284210059027, 49 => + 1.3424512661794, 50 => 1.1743365450983, 51 => + 1.2387345559532, 52 => 1.2485728609648, 53 => + 1.2330096418558, 54 => 1.1857882621709, 55 => + 1.2344956522411, 56 => 1.2047675730648, 57 => + 1.292419000136, 58 => 1.3405480219013, 59 => + 1.3971752198648, 60 => 1.4359555309649, 61 => + 1.3243735045701, 62 => 1.2359389187087, 63 => + 1.2201320423161, 64 => 1.3602246705197, 65 => + 1.360886940568, 66 => 1.3493553211075, 67 => + 1.4401769929405, 68 => 1.3979767849951, 69 => + 1.4545882591647, 70 => 1.337801210539, 71 => + 1.3793601365977, 72 => 1.4586769476223, 73 => + 1.5230946076475, 74 => 1.4124735946125, 75 => + 1.4030318592551, 76 => 1.349158816711, 77 => + 1.3994840622105, 78 => 1.4239672612346, 79 => + 1.40812256221, 80 => 1.4583856197192, 81 => + 1.4613314581567, 82 => 1.6756755916668, 83 => + 1.8580313939158, 84 => 1.8342360959805, 85 => + 1.9216082598086, 86 => 1.9478846253628, 87 => + 2.0244872112436, 88 => 1.9560660777181, 89 => + 1.8415152640121, 90 => 1.8471764273372, 91 => + 1.8889886695023, 92 => 1.8195007209252, 93 => + 1.8960270595999, 94 => 1.8644490575386, 95 => + 1.971196340772, 96 => 2.015583152659, 97 => + 1.9959882430428, 98 => 2.1063668082622, 99 => + 2.1719175769191, 100 => 2.1875938345039, 101 => + 2.1587594039981, 102 => 2.1278241823627, 103 => + 2.298793912594, 104 => 2.3723774302753, 105 => + 2.4413392788904, 106 => 2.4834594954125, 107 => + 2.5164271989421, 108 => 2.48274719503, 109 => + 2.4492997581034, 110 => 2.1412357263019, 111 => + 2.0314268112566, 112 => 1.9596098764628, 113 => + 2.0250983127109, 114 => 1.924959829851, 115 => + 1.9603612943993, 116 => 2.0540576271866, 117 => + 2.0568349960689, 118 => 2.0811524692325, 119 => + 2.0581964759165, 120 => 2.020162840272, 121 => + 2.0626517638667, 122 => 1.9286563823225, 123 => + 2.0127912437563, 124 => 1.9491858277931, 125 => + 1.8692310150316, 126 => 1.6993275416762, 127 => + 1.5849680675709, 128 => 1.5422481968304, 129 => + 1.603188853916, 130 => 1.6449504349551, 131 => + 1.6570332084417, 132 => 1.7563884552262, 133 => + 1.7346008663135, 134 => 1.741307942998, 135 => + 1.7415848536123, 136 => 1.7014366147405, 137 => + 1.6719646364256, 138 => 1.7092888030342, 139 => + 1.7371529028402, 140 => 1.7019154041991, 141 => + 1.7662473702497, 142 => 1.8480766044197, 143 => + 1.8355114169662, 144 => 1.7819817315586, 145 => + 1.7148079481036, 146 => 1.6241989833489, 147 => + 1.4624626548138, 148 => 1.5040542012939, 149 => + 1.442295346913, 150 => 1.4187087000604, 151 => + 1.4225097958511, 152 => 1.5001324671865, 153 => + 1.4584802723727, 154 => 1.5342572961469, 155 => + 1.514133174734, 156 => 1.5443934302345, 157 => + 1.5476883863698, 158 => 1.6080128685721, 159 => + 1.5816649899396, 160 => 1.5310436755918, 161 => + 1.518280754595, 162 => 1.5216184249044, 163 => + 1.4393414811719, 164 => 1.409379582707, 165 => + 1.436861898056, 166 => 1.4739894373751, 167 => + 1.4512785421546, 168 => 1.496057581316, 169 => + 1.3817455776456, 170 => 1.2990312802211, 171 => + 1.3073949130374, 172 => 1.2473214566896, 173 => + 1.1105915111374, 174 => 1.0420360580822, 175 => + 1.1744654786356, 176 => 1.0602876800127, 177 => + 1.074408841208, 178 => 1.18387615056, 179 => + 1.1890999077101, 180 => 1.0549293038746, 181 => + 1.0570601708416, 182 => 1.0800216692849, 183 => + 0.96274117702549, 184 => 0.9501673977047, 185 => + 0.97710108451711, 186 => 0.89886322996001, 187 => + 0.9239453369566, 188 => 0.96299807255386, 189 => + 1.0105532418267, 190 => 1.0164009465948, 191 => + 1.0413107606824, 192 => 1.0475248122459, 193 => + 1.0266007451985, 194 => 1.0159556206533, 195 => + 1.0943852922517, 196 => 1.0750418553654, 197 => + 0.97774129938915, 198 => 0.98590717162284, 199 => + 0.87713795242119, 200 => 0.90770624057599, 201 => + 0.87557547650302, 202 => 0.95754187545856, 203 => + 1.0111465867283, 204 => 0.93224663470275, 205 => + 0.93886113881632, 206 => 0.94128877256653, 207 => + 0.9559086414866, 208 => 0.97782683000598, 209 => + 1.0648991708916, 210 => 1.1759619281479, 211 => + 1.1323001889786, 212 => 1.2173222321276, 213 => + 1.192219780365, 214 => 1.1507367671992, 215 => + 1.0062415877475, 216 => 1.0017043563084, 217 => + 0.94468309902865, 218 => 0.99384124056529, 219 => + 1.0514822705943, 220 => 1.0451723914426, 221 => + 1.0776122119814, 222 => 1.2013601009631, 223 => + 1.1765086398423, 224 => 1.2387735028784, 225 => + 1.2441365026242, 226 => 1.2694500268723, 227 => + 1.2789962941485, 228 => 1.2442094256309, 229 => + 1.2352688438234, 230 => 1.2571277155372, 231 => + 1.3291795377077, 232 => 1.2703480599183, 233 => + 1.30729508393, 234 => 1.3233030218068, 235 => + 1.2861232143244, 236 => 1.3168684998023, 237 => + 1.2499001566772, 238 => 1.2622769692485, 239 => + 1.2160789893735, 240 => 1.2288877111321, 241 => + 1.222967255453, 242 => 1.2998243638567, 243 => + 1.3443008723449, 244 => 1.339680674028, 245 => + 1.3779965791538, 246 => 1.3560080691721, 247 => + 1.3470544172094, 248 => 1.3166882067851, 249 => + 1.4452459865932, 250 => 1.4514278120119, 251 => + 1.413690283372, 252 => 1.4178934332405, 253 => + 1.4237414657565, 254 => 1.3777636409301, 255 => + 1.4041849448389, 256 => 1.4049533546771, 257 => + 1.4277375831259, 258 => 1.4224090113077, 259 => + 1.4647907974628, 260 => 1.4243190632657, 261 => + 1.4286580133998, 262 => 1.4348828641501, 263 => + 1.415409243977, 264 => 1.4476028555859, 265 => + 1.4538821661641, 266 => 1.4883184435336, 267 => + 1.4205032194634, 268 => 1.3856543933372, 269 => + 1.2716906168086, 270 => 1.3462117624752, 271 => + 1.3003015423298, 272 => 1.2148491725878, 273 => + 1.2605381058318, 274 => 1.2690047369619, 275 => + 1.3327723638582, 276 => 1.3118643588249, 277 => + 1.293007944258, 278 => 1.2548761810876, 279 => + 1.3335015938603, 280 => 1.3152744239077, 281 => + 1.2564376463182, 282 => 1.2478417859372, 283 => + 1.2518821298414, 284 => 1.2036453589032, 285 => + 1.1798564480155, 286 => 1.2062515260098, 287 => + 1.2129817801455, 288 => 1.1405762096618, 289 => + 1.0161049810033, 290 => 1.0030124197677, 291 => + 1.0111565082559, 292 => 1.0084286839061, 293 => + 0.95068297130577, 294 => 1.0450005357207, 295 => + 1.211596899292, 296 => 1.3762615912002, 297 => + 1.530127116787, 298 => 1.5167370832585, 299 => + 1.6259521507076, 300 => 1.6518467383405, 301 => + 1.7713043850286, 302 => 1.6396708687084, 303 => + 1.6116177484122, 304 => 1.5225729470695, 305 => + 1.6101471149808); + + +$xdata = array( + + 0 => 444348000, 1 => 446853600, 2 => + 449532000, 3 => 452124000, 4 => 454802400, 5 => + 457394400, 6 => 460072800, 7 => 462751200, 8 => + 465343200, 9 => 468021600, 10 => 470613600, 11 => + 473292000, 12 => 475970400, 13 => 478389600, 14 => + 481068000, 15 => 483660000, 16 => 486338400, 17 => + 488930400, 18 => 491608800, 19 => 494287200, 20 => + 496879200, 21 => 499557600, 22 => 502149600, 23 => + 504828000, 24 => 507506400, 25 => 509925600, 26 => + 512604000, 27 => 515196000, 28 => 517874400, 29 => + 520466400, 30 => 523144800, 31 => 525823200, 32 => + 528415200, 33 => 531093600, 34 => 533685600, 35 => + 536364000, 36 => 539042400, 37 => 541461600, 38 => + 544140000, 39 => 546732000, 40 => 549410400, 41 => + 552002400, 42 => 554680800, 43 => 557359200, 44 => + 559951200, 45 => 562629600, 46 => 565221600, 47 => + 567900000, 48 => 570578400, 49 => 573084000, 50 => + 575762400, 51 => 578354400, 52 => 581032800, 53 => + 583624800, 54 => 586303200, 55 => 588981600, 56 => + 591573600, 57 => 594252000, 58 => 596844000, 59 => + 599522400, 60 => 602200800, 61 => 604620000, 62 => + 607298400, 63 => 609890400, 64 => 612568800, 65 => + 615160800, 66 => 617839200, 67 => 620517600, 68 => + 623109600, 69 => 625788000, 70 => 628380000, 71 => + 631058400, 72 => 633736800, 73 => 636156000, 74 => + 638834400, 75 => 641426400, 76 => 644104800, 77 => + 646696800, 78 => 649375200, 79 => 652053600, 80 => + 654645600, 81 => 657324000, 82 => 659916000, 83 => + 662594400, 84 => 665272800, 85 => 667692000, 86 => + 670370400, 87 => 672962400, 88 => 675640800, 89 => + 678232800, 90 => 680911200, 91 => 683589600, 92 => + 686181600, 93 => 688860000, 94 => 691452000, 95 => + 694130400, 96 => 696808800, 97 => 699314400, 98 => + 701992800, 99 => 704584800, 100 => 707263200, 101 => + 709855200, 102 => 712533600, 103 => 715212000, 104 => + 717804000, 105 => 720482400, 106 => 723074400, 107 => + 725752800, 108 => 728431200, 109 => 730850400, 110 => + 733528800, 111 => 736120800, 112 => 738799200, 113 => + 741391200, 114 => 744069600, 115 => 746748000, 116 => + 749340000, 117 => 752018400, 118 => 754610400, 119 => + 757288800, 120 => 759967200, 121 => 762386400, 122 => + 765064800, 123 => 767656800, 124 => 770335200, 125 => + 772927200, 126 => 775605600, 127 => 778284000, 128 => + 780876000, 129 => 783554400, 130 => 786146400, 131 => + 788824800, 132 => 791503200, 133 => 793922400, 134 => + 796600800, 135 => 799192800, 136 => 801871200, 137 => + 804463200, 138 => 807141600, 139 => 809820000, 140 => + 812412000, 141 => 815090400, 142 => 817682400, 143 => + 820360800, 144 => 823039200, 145 => 825544800, 146 => + 828223200, 147 => 830815200, 148 => 833493600, 149 => + 836085600, 150 => 838764000, 151 => 841442400, 152 => + 844034400, 153 => 846712800, 154 => 849304800, 155 => + 851983200, 156 => 854661600, 157 => 857080800, 158 => + 859759200, 159 => 862351200, 160 => 865029600, 161 => + 867621600, 162 => 870300000, 163 => 872978400, 164 => + 875570400, 165 => 878248800, 166 => 880840800, 167 => + 883519200, 168 => 886197600, 169 => 888616800, 170 => + 891295200, 171 => 893887200, 172 => 896565600, 173 => + 899157600, 174 => 901836000, 175 => 904514400, 176 => + 907106400, 177 => 909784800, 178 => 912376800, 179 => + 915055200, 180 => 917733600, 181 => 920152800, 182 => + 922831200, 183 => 925423200, 184 => 928101600, 185 => + 930693600, 186 => 933372000, 187 => 936050400, 188 => + 938642400, 189 => 941320800, 190 => 943912800, 191 => + 946591200, 192 => 949269600, 193 => 951775200, 194 => + 954453600, 195 => 957045600, 196 => 959724000, 197 => + 962316000, 198 => 964994400, 199 => 967672800, 200 => + 970264800, 201 => 972943200, 202 => 975535200, 203 => + 978213600, 204 => 980892000, 205 => 983311200, 206 => + 985989600, 207 => 988581600, 208 => 991260000, 209 => + 993852000, 210 => 996530400, 211 => 999208800, 212 => + 1001800800, 213 => 1004479200, 214 => 1007071200, + 215 => 1009749600, 216 => 1012428000, 217 => + 1014847200, 218 => 1017525600, 219 => 1020117600, + 220 => 1022796000, 221 => 1025388000, 222 => + 1028066400, 223 => 1030744800, 224 => 1033336800, + 225 => 1036015200, 226 => 1038607200, 227 => + 1041285600, 228 => 1043964000, 229 => 1046383200, + 230 => 1049061600, 231 => 1051653600, 232 => + 1054332000, 233 => 1056924000, 234 => 1059602400, + 235 => 1062280800, 236 => 1064872800, 237 => + 1067551200, 238 => 1070143200, 239 => 1072821600, + 240 => 1075500000, 241 => 1078005600, 242 => + 1080684000, 243 => 1083276000, 244 => 1085954400, + 245 => 1088546400, 246 => 1091224800, 247 => + 1093903200, 248 => 1096495200, 249 => 1099173600, + 250 => 1101765600, 251 => 1104444000, 252 => + 1107122400, 253 => 1109541600, 254 => 1112220000, + 255 => 1114812000, 256 => 1117490400, 257 => + 1120082400, 258 => 1122760800, 259 => 1125439200, + 260 => 1128031200, 261 => 1130709600, 262 => + 1133301600, 263 => 1135980000, 264 => 1138658400, + 265 => 1141077600, 266 => 1143756000, 267 => + 1146348000, 268 => 1149026400, 269 => 1151618400, + 270 => 1154296800, 271 => 1156975200, 272 => + 1159567200, 273 => 1162245600, 274 => 1164837600, + 275 => 1167516000, 276 => 1170194400, 277 => + 1172613600, 278 => 1175292000, 279 => 1177884000, + 280 => 1180562400, 281 => 1183154400, 282 => + 1185832800, 283 => 1188511200, 284 => 1191103200, + 285 => 1193781600, 286 => 1196373600, 287 => + 1199052000, 288 => 1201730400, 289 => 1204236000, + 290 => 1206914400, 291 => 1209506400, 292 => + 1212184800, 293 => 1214776800, 294 => 1217455200, + 295 => 1220133600, 296 => 1222725600, 297 => + 1225404000, 298 => 1227996000, 299 => 1230674400, + 300 => 1233352800, 301 => 1235772000, 302 => + 1238450400, 303 => 1241042400, 304 => 1243720800, + 305 => 1246312800, + ); + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,55 @@ +SetMargin(40,40,30,70); +$graph->title->Set('Date: '.date('Y-m-d',$now)); +$graph->SetAlphaBlending(); + +// Setup a manual x-scale (We leave the sentinels for the +// Y-axis at 0 which will then autoscale the Y-axis.) +// We could also use autoscaling for the x-axis but then it +// probably will start a little bit earlier than the first value +// to make the first value an even number as it sees the timestamp +// as an normal integer value. +$graph->SetScale("intlin",0,200,$now,$datax[$n-1]); + +// Setup the x-axis with a format callback to convert the timestamp +// to a user readable time +$graph->xaxis->SetLabelFormatCallback('TimeCallback'); +$graph->xaxis->SetLabelAngle(90); + +// Create the line +$p1 = new LinePlot($datay,$datax); +$p1->SetColor("blue"); + +// Set the fill color partly transparent +$p1->SetFillColor("blue@0.4"); + +// Add lineplot to the graph +$graph->Add($p1); + +// Output line +$graph->Stroke(); +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +SetMargin(40,40,30,130); + +// Fix the Y-scale to go between [0,100] and use date for the x-axis +$graph->SetScale('datlin',0,100); +$graph->title->Set("Example on Date scale"); + +// Set the angle for the labels to 90 degrees +$graph->xaxis->SetLabelAngle(90); + +$line = new LinePlot($data,$xdata); +$line->SetLegend('Year 2005'); +$line->SetFillColor('lightblue@0.5'); +$graph->Add($line); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +SetMargin(40,40,30,130); + +// Fix the Y-scale to go between [0,100] and use date for the x-axis +$graph->SetScale('datlin',0,100); +$graph->title->Set("Example on Date scale"); + +// Set the angle for the labels to 90 degrees +$graph->xaxis->SetLabelAngle(90); + +// It is possible to adjust the density for the X-axis as well +// The following call makes the dates a little more sparse +// $graph->SetTickDensity(TICKD_NORMAL,TICKD_SPARSE); + +// The automatic format string for dates can be overridden +// $graph->xaxis->scale->SetDateFormat('h:i'); + +// Adjust the start/end to a specific alignment +$graph->xaxis->scale->SetTimeAlign(MINADJ_15); + +$line = new LinePlot($data,$xdata); +$line->SetLegend('Year 2005'); +$line->SetFillColor('lightblue@0.5'); +$graph->Add($line); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateaxisex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,44 @@ +SetMargin(40,40,30,130); + +// Fix the Y-scale to go between [0,100] and use date for the x-axis +$graph->SetScale('datlin',0,100); +$graph->title->Set("Example on Date scale"); + +// Set the angle for the labels to 90 degrees +$graph->xaxis->SetLabelAngle(90); + +// The automatic format string for dates can be overridden +$graph->xaxis->scale->SetDateFormat('H:i'); + +// Adjust the start/end to a specific alignment +$graph->xaxis->scale->SetTimeAlign(MINADJ_10); + +$line = new LinePlot($data,$xdata); +$line->SetLegend('Year 2005'); +$line->SetFillColor('lightblue@0.5'); +$graph->Add($line); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datescaleticksex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datescaleticksex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/datescaleticksex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/datescaleticksex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,63 @@ +SetMargin(80,30,50,40); +$graph->SetMarginColor('white'); +$graph->SetScale('dateint'); +$graph->title->Set('Current Bids'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set('(Updated every 5 minutes)'); +$graph->subtitle->SetFont(FF_ARIAL,FS_ITALIC,10); + +// Enable antialias +$graph->img->SetAntiAliasing(); + +// Setup the y-axis to show currency values +$graph->yaxis->SetLabelFormatCallback('number_format'); +$graph->yaxis->SetLabelFormat('$%s'); + +//Use hour:minute format for the labels +$graph->xaxis->scale->SetDateFormat('H:i'); + +// Force labels to only be displayed every 5 minutes +$graph->xaxis->scale->ticks->Set(INTERVAL); + +// Adjust the start time for an "even" 5 minute, i.e. 5,10,15,20,25, ... +$graph->xaxis->scale->SetTimeAlign(MINADJ_5); + +// Create the plots using the dummy data created at the beginning +$line = array(); +for( $i=0; $i < $m; ++$i ) { + $line[$i] = new LinePlot($bids[$i],$times); + $line[$i]->mark->SetType(MARK_SQUARE); +} +$graph->Add($line); + +// Send the graph back to the client +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateutilex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateutilex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateutilex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateutilex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,54 @@ +clearTheme(); + +// We set the x-scale min/max values to avoid empty space +// on the side of the plot +$graph->SetScale('intlin',0,0,min($xdata),max($xdata)); +$graph->SetMargin(60,20,40,60); + +// Setup the titles +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->Set('Development since 1984'); +$graph->subtitle->SetFont(FF_ARIAL,FS_ITALIC,10); +$graph->subtitle->Set('(Example using DateScaleUtils class)'); + +// Setup the labels to be correctly format on the X-axis +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,8); +$graph->xaxis->SetLabelAngle(30); + +// The second paramter set to 'true' will make the library interpret the +// format string as a date format. We use a Month + Year format +$graph->xaxis->SetLabelFormatString('M, Y',true); + +// Get manual tick every second year +list($tickPos,$minTickPos) = $dateUtils->getTicks($xdata,DSUTILS_YEAR2); +$graph->xaxis->SetTickPositions($tickPos,$minTickPos); + +// First add an area plot +$lp1 = new LinePlot($ydata,$xdata); +$lp1->SetWeight(0); +$lp1->SetFillColor('orange@0.85'); +$graph->Add($lp1); + +// And then add line. We use two plots in order to get a +// more distinct border on the graph +$lp2 = new LinePlot($ydata,$xdata); +$lp2->SetColor('orange'); +$graph->Add($lp2); + +// And send back to the client +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateutilex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateutilex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dateutilex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dateutilex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +clearTheme(); +$graph->SetScale('datlin'); +$graph->SetMargin(60,20,40,60); + +// Setup the titles +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->Set('Development since 1984'); +$graph->subtitle->SetFont(FF_ARIAL,FS_ITALIC,10); +$graph->subtitle->Set('(Example using the builtin date scale)'); + +// Setup the labels to be correctly format on the X-axis +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,8); +$graph->xaxis->SetLabelAngle(30); + +// The second paramter set to 'true' will make the library interpret the +// format string as a date format. We use a Month + Year format +// $graph->xaxis->SetLabelFormatString('M, Y',true); + +// First add an area plot +$lp1 = new LinePlot($ydata,$xdata); +$lp1->SetWeight(0); +$lp1->SetFillColor('orange@0.85'); +$graph->Add($lp1); + +// And then add line. We use two plots in order to get a +// more distinct border on the graph +$lp2 = new LinePlot($ydata,$xdata); +$lp2->SetColor('orange'); +$graph->Add($lp2); + +// And send back to the client +$graph->Stroke(); + +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dm_ex6.png and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dm_ex6.png differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dupyaxisex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dupyaxisex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/dupyaxisex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/dupyaxisex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +E(-M_PI,M_PI,25); + +$graph = new Graph(300,200); +$graph->clearTheme(); +$graph->SetScale("linlin"); +$graph->SetMargin(50,50,20,30); +$graph->SetFrame(false); +$graph->SetBox(true,'black',2); +$graph->SetMarginColor('white'); +$graph->SetColor('lightyellow'); + +$graph->title->Set('Duplicating Y-axis'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$graph->SetAxisStyle(AXSTYLE_YBOXIN); +$graph->xgrid->Show(); + +$lp1 = new LinePlot($ydata,$xdata); +$lp1->SetColor("blue"); +$lp1->SetWeight(2); +$graph->Add($lp1); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example0-0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example0-0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example0-0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example0-0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,25 @@ +SetScale('intlin'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +SetScale('textlin'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor('blue'); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example10.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example10.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example10.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example10.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,59 @@ +img->SetMargin(40,110,20,40); +$graph->SetScale("textlog"); +$graph->SetY2Scale("log"); +$graph->SetShadow(); + +$graph->ygrid->Show(true,true); +$graph->xgrid->Show(true,false); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot2=new LinePlot($y2data); + +$graph->yaxis->scale->ticks->SupressFirst(); +$graph->y2axis->scale->ticks->SupressFirst(); +// Add the plot to the graph +$graph->Add($lineplot); +$graph->AddY2($lineplot2); +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); +$graph->y2axis->SetColor("orange"); + +$graph->title->Set("Example 10"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); + +$graph->yaxis->SetColor("blue"); + +$lineplot->SetLegend("Plot 1"); +$lineplot2->SetLegend("Plot 2"); + +$graph->legend->Pos(0.05,0.5,"right","center"); + +$graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetTextTickInterval(2); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example1.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example1.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example1.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example1.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,26 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->img->SetMargin(30,90,40,50); +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->title->Set("Example 1.1 same y-values"); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetLegend("Test 1"); +$lineplot->SetColor("blue"); +$lineplot->SetWeight(5); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example11.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example11.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example11.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example11.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +Push(); + +// Create the graph. These two calls are always required +$graph = new Graph(300,200); +$graph->SetScale("textlin"); + +$graph->SetMargin(40,20,20,60); + +$graph->title->Set("Timing a graph"); +$graph->footer->right->Set('Timer (ms): '); +$graph->footer->right->SetFont(FF_COURIER,FS_ITALIC); +$graph->footer->SetTimer($timer); + +// Create the linear plot +$lineplot=new LinePlot($ydata); + +$lineplot2=new LinePlot($ydata2); + +// Add the plot to the graph +$graph->Add($lineplot); +$graph->Add($lineplot2); + +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); + +$graph->yaxis->SetColor("red"); +$graph->yaxis->SetWeight(2); +$graph->SetShadow(); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example1.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example1.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example1.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example1.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,29 @@ +SetScale("textlin"); +$graph->img->SetMargin(30,90,40,50); +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->title->Set("Dashed lineplot"); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetLegend("Test 1"); +$lineplot->SetColor("blue"); + +// Style can also be specified as SetStyle([1|2|3|4]) or +// SetStyle("solid"|"dotted"|"dashed"|"lobgdashed") +$lineplot->SetStyle("dashed"); + + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example13.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example13.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example13.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example13.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$graph->img->SetMargin(40,30,20,40); +$graph->SetShadow(); + +// Create the error plot +$errplot=new ErrorPlot($errdatay); +$errplot->SetColor("red"); +$errplot->SetWeight(2); + +// Add the plot to the graph +$graph->Add($errplot); + +$graph->title->Set("Simple error plot"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$datax = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($datax); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example14.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example14.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example14.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example14.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$graph->img->SetMargin(40,30,20,40); +$graph->SetShadow(); + +// Create the error plot +$errplot=new ErrorPlot($errdatay); +$errplot->SetColor("red"); +$errplot->SetWeight(2); +$errplot->SetCenter(); + +// Add the plot to the graph +$graph->Add($errplot); + +$graph->title->Set("Simple error plot"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$datax = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($datax); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example15.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example15.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example15.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example15.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$graph->img->SetMargin(40,30,20,40); +$graph->SetShadow(); + +// Create the linear plot +$errplot=new ErrorLinePlot($errdatay); +$errplot->SetColor("red"); +$errplot->SetWeight(2); +$errplot->SetCenter(); +$errplot->line->SetWeight(2); +$errplot->line->SetColor("blue"); + +// Add the plot to the graph +$graph->Add($errplot); + +$graph->title->Set("Linear error plot"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$datax = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($datax); + + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,45 @@ +clearTheme(); +$graph->SetScale('textlin'); + +$graph->img->SetMargin(40,130,20,40); +$graph->SetShadow(); + +// Create the linear error plot +$l1plot=new LinePlot($l1datay); +$l1plot->SetColor('red'); +$l1plot->SetWeight(2); +$l1plot->SetLegend('Prediction'); + +// Create the bar plot +$l2plot = new LinePlot($l2datay); +$l2plot->SetFillColor('orange'); +$l2plot->SetLegend('Result'); + +// Add the plots to the graph +$graph->Add($l2plot); +$graph->Add($l1plot); + +$graph->title->Set('Mixing line and filled line'); +$graph->xaxis->title->Set('X-title'); +$graph->yaxis->title->Set('Y-title'); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +//$graph->xaxis->SetTickLabels($datax); +//$graph->xaxis->SetTextTickInterval(2); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,47 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$graph->img->SetMargin(40,130,20,40); +$graph->SetShadow(); + +// Create the linear error plot +$l1plot=new LinePlot($l1datay); +$l1plot->SetColor("red"); +$l1plot->SetWeight(2); +$l1plot->SetLegend("Prediction"); + +// Create the bar plot +$bplot = new BarPlot($l2datay); +$bplot->SetFillColor("orange"); +$bplot->SetLegend("Result"); + +// Add the plots to t'he graph +$graph->Add($l1plot); +$graph->Add($bplot); + + +$graph->title->Set("Adding a line plot to a bar graph v1"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +//$graph->xaxis->SetTickLabels($datax); +//$graph->xaxis->SetTextTickInterval(2); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +clearTheme(); +$graph->SetScale('textlin'); + +$graph->img->SetMargin(40,130,20,40); +$graph->SetShadow(); + +// Create the linear error plot +$l1plot=new LinePlot($l1datay); +$l1plot->SetColor('red'); +$l1plot->SetWeight(2); +$l1plot->SetLegend('Prediction'); + +// Create the bar plot +$bplot = new BarPlot($l2datay); +$bplot->SetFillColor('orange'); +$bplot->SetLegend('Result'); + +// Add the plots to t'he graph +$graph->Add($bplot); +$graph->Add($l1plot); + +$graph->title->Set('Adding a line plot to a bar graph v1'); +$graph->xaxis->title->Set('X-title'); +$graph->yaxis->title->Set('Y-title'); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$graph->xaxis->SetTickLabels($datax); +//$graph->xaxis->SetTextTickInterval(2); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,47 @@ +clearTheme(); +$graph->SetScale('intlin'); + +$graph->img->SetMargin(40,130,20,40); +$graph->SetShadow(); + +// Create the linear error plot +$l1plot=new LinePlot($l1datay); +$l1plot->SetColor('red'); +$l1plot->SetWeight(2); +$l1plot->SetLegend('Prediction'); + +// Create the bar plot +$bplot = new BarPlot($l2datay); +$bplot->SetFillColor('orange'); +$bplot->SetLegend('Result'); + +// Add the plots to t'he graph +$graph->Add($bplot); +$graph->Add($l1plot); + +$graph->title->Set('Adding a line plot to a bar graph v3'); +$graph->xaxis->title->Set('X-title'); +$graph->yaxis->title->Set('Y-title'); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$datax = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($datax); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ +clearTheme(); +$graph->img->SetMargin(40,70,20,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->SetColor(array(250,250,250)); + +$graph->img->SetTransparent("white"); + +$t1 = new Text("This is a text"); +$t1->SetPos(0.5,0.5); +$t1->SetOrientation("h"); +$t1->SetFont(FF_FONT1,FS_BOLD); +$t1->SetBox("white","black","gray"); +$t1->SetColor("black"); +$graph->AddText($t1); + +// Create the linear error plot +$l1plot=new LinePlot($l1datay); +$l1plot->SetColor("blue"); +$l1plot->SetWeight(2); +$l1plot->SetLegend("Prediction"); + +// Create the bar plot +$l2plot = new BarPlot($l2datay); +$l2plot->SetFillColor("orange"); +$l2plot->SetLegend("Result"); + +// Add the plots to the graph +$graph->Add($l1plot); +$graph->Add($l2plot); + + +$graph->title->Set("Example 16.3"); +$graph->xaxis->title->Set("Month"); +$graph->yaxis->title->Set("x10,000 US$"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$graph->xaxis->SetTickLabels($datax); +//$graph->xaxis->SetTextTickInterval(2); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ +GetStat(); +list( $xd, $yd ) = $lr->GetY(0,19); + +// Create the graph +$graph = new Graph(300,250); +$graph->clearTheme(); +$graph->SetScale('linlin'); + +// Setup title +$graph->title->Set("Linear regression"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +$graph->subtitle->Set('(stderr='.sprintf('%.2f',$stderr).', corr='.sprintf('%.2f',$corr).')'); +$graph->subtitle->SetFont(FF_ARIAL,FS_NORMAL,12); + +// make sure that the X-axis is always at the +// bottom at the plot and not just at Y=0 which is +// the default position +$graph->xaxis->SetPos('min'); + +// Create the scatter plot with some nice colors +$sp1 = new ScatterPlot($datay,$datax); +$sp1->mark->SetType(MARK_FILLEDCIRCLE); +$sp1->mark->SetFillColor("red"); +$sp1->SetColor("blue"); +$sp1->SetWeight(3); +$sp1->mark->SetWidth(4); + +// Create the regression line +$lplot = new LinePlot($yd); +$lplot->SetWeight(2); +$lplot->SetColor('navy'); + +// Add the pltos to the line +$graph->Add($sp1); +$graph->Add($lplot); + +// ... and stroke +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example16.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example16.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,45 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$graph->img->SetMargin(40,30,20,40); +$graph->SetShadow(); + +// Create the linear plot +$errplot=new ErrorLinePlot($errdatay); +$errplot->SetColor("red"); +$errplot->SetWeight(2); +$errplot->SetCenter(); +$errplot->line->SetWeight(2); +$errplot->line->SetColor("blue"); + +// Setup the legends +$errplot->SetLegend("Min/Max"); +$errplot->line->SetLegend("Average"); + +// Add the plot to the graph +$graph->Add($errplot); + +$graph->title->Set("Linear error plot"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$datax = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($datax); + + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example17.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example17.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example17.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example17.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->img->SetMargin(40,30,20,40); + +// Create the linear plots for each category +$dplot[] = new LinePLot($datay1); +$dplot[] = new LinePLot($datay2); +$dplot[] = new LinePLot($datay3); + +$dplot[0]->SetFillColor("red"); +$dplot[1]->SetFillColor("blue"); +$dplot[2]->SetFillColor("green"); + +// Create the accumulated graph +$accplot = new AccLinePlot($dplot); + +// Add the plot to the graph +$graph->Add($accplot); + +$graph->xaxis->SetTextTickInterval(2); +$graph->title->Set("Example 17"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example18.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example18.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example18.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example18.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ +clearTheme(); +$graph->SetScale("textlin"); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->img->SetMargin(40,30,20,40); + +// Create a bar pot +$bplot = new BarPlot($datay); +$graph->Add($bplot); + +// Setup the titles +$graph->title->Set("A simple bar graph"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example19.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example19.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example19.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example19.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +clearTheme(); +$graph->SetScale('intlin'); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->SetMargin(40,30,20,40); + +// Create a bar pot +$bplot = new BarPlot($datay); + +// Adjust fill color +$bplot->SetFillColor('orange'); +$graph->Add($bplot); + +// Setup the titles +$graph->title->Set('A basic bar graph'); +$graph->xaxis->title->Set('X-title'); +$graph->yaxis->title->Set('Y-title'); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example19.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example19.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example19.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example19.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +clearTheme(); +$graph->SetScale('textlin'); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->SetMargin(40,30,20,40); + +// Create a bar pot +$bplot = new BarPlot($datay); + +// Adjust fill color +$bplot->SetFillColor('orange'); +$graph->Add($bplot); + +// Setup the titles +$graph->title->Set('A basic bar graph'); +$graph->xaxis->title->Set('X-title'); +$graph->yaxis->title->Set('Y-title'); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,25 @@ +SetScale("textlin"); +$graph->img->SetMargin(50,90,40,50); +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->title->Set("Examples for graph"); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetLegend("Test 1"); +$lineplot->SetColor("blue"); + + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +clearTheme(); +$graph->SetScale("textlin"); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->img->SetMargin(40,30,20,40); + +// Create a bar pot +$bplot = new BarPlot($datay); + +// Adjust fill color +$bplot->SetFillColor('orange'); +$bplot->value->Show(); +$graph->Add($bplot); + +// Setup the titles +$graph->title->Set("Bar graph"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->yaxis->scale->SetGrace(20); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->img->SetMargin(40,30,20,40); + +// Create a bar pot +$bplot = new BarPlot($datay); + +// Adjust fill color +$bplot->SetFillColor('orange'); +$bplot->value->Show(); +$graph->Add($bplot); + +// Setup the titles +$graph->title->Set("Bar graph with Y-scale grace"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->yaxis->scale->SetGrace(20); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->img->SetMargin(40,30,20,40); + +// Create a bar pot +$bplot = new BarPlot($datay); + +// Adjust fill color +$bplot->SetFillColor('orange'); +$bplot->value->Show(); +$bplot->value->SetFont(FF_ARIAL,FS_BOLD,10); +$bplot->value->SetAngle(45); +$bplot->value->SetFormat('%0.1f'); +$graph->Add($bplot); + +// Setup the titles +$graph->title->Set("Bar graph with Y-scale grace"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->yaxis->scale->SetGrace(20); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->img->SetMargin(40,30,20,40); + +// Create a bar pot +$bplot = new BarPlot($datay); + +// Adjust fill color +$bplot->SetFillColor('orange'); +$bplot->SetShadow(); +$bplot->value->Show(); +$bplot->value->SetFont(FF_ARIAL,FS_BOLD,10); +$bplot->value->SetAngle(45); +$bplot->value->SetFormat('%0.1f'); +$graph->Add($bplot); + +// Setup the titles +$graph->title->Set("Bar graph with drop shadow"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +clearTheme(); +$graph->SetScale("textlin"); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->img->SetMargin(40,30,20,40); + +// Create a bar pot +$bplot = new BarPlot($datay); + +// Adjust fill color +$bplot->SetFillColor('orange'); + +// Setup values +$bplot->value->Show(); +$bplot->value->SetFormat('%d'); +$bplot->value->SetFont(FF_FONT1,FS_BOLD); + +// Center the values in the bar +$bplot->SetValuePos('center'); + +// Make the bar a little bit wider +$bplot->SetWidth(0.7); + +$graph->Add($bplot); + +// Setup the titles +$graph->title->Set("Centered values for bars"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example20.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example20.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +clearTheme(); +$graph->SetScale("textlin"); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->img->SetMargin(40,30,20,40); + +// Create a bar pot +$bplot = new BarPlot($datay); + +// Adjust fill color +$bplot->SetFillColor('orange'); +$bplot->SetWidth(1.0); +$graph->Add($bplot); + +// Setup the titles +$graph->title->Set("Bar graph"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example2.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example2.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example2.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example2.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +SetScale("textlin"); + +// Create the linear plot +$lineplot=new LinePlot($ydata); + +$lineplot->value->Show(); +$lineplot->value->SetColor("red"); +$lineplot->value->SetFont(FF_FONT1,FS_BOLD); + + +// Add the plot to the graph +$graph->Add($lineplot); + +$graph->img->SetMargin(40,20,20,40); +$graph->title->Set("Example 2.1"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example21.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example21.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example21.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example21.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$graph->SetShadow(); +$graph->img->SetMargin(40,30,20,40); + +// Create the bar plots +$b1plot = new BarPlot($data1y); +$b1plot->SetFillColor("orange"); +$b2plot = new BarPlot($data2y); +$b2plot->SetFillColor("blue"); + +// Create the grouped bar plot +$gbplot = new GroupBarPlot(array($b1plot,$b2plot)); + +// ...and add it to the graPH +$graph->Add($gbplot); + +$graph->title->Set("Example 21"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example22.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example22.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example22.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example22.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +$graph->img->SetMargin(40,30,20,40); + +// Create the bar plots +$b1plot = new BarPlot($data1y); +$b1plot->SetFillColor("orange"); +$b2plot = new BarPlot($data2y); +$b2plot->SetFillColor("blue"); + +// Create the grouped bar plot +$gbplot = new GroupBarPlot(array($b1plot,$b2plot)); +$gbplot->SetWidth(0.9); + +// ...and add it to the graPH +$graph->Add($gbplot); + +$graph->title->Set("Adjusting the width"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example23.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example23.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example23.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example23.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$graph->SetShadow(); +$graph->img->SetMargin(40,30,20,40); + +// Create the bar plots +$b1plot = new BarPlot($data1y); +$b1plot->SetFillColor("orange"); +$b2plot = new BarPlot($data2y); +$b2plot->SetFillColor("blue"); + +// Create the grouped bar plot +$gbplot = new AccBarPlot(array($b1plot,$b2plot)); + +// ...and add it to the graPH +$graph->Add($gbplot); + +$graph->title->Set("Accumulated bar plots"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example24.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example24.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example24.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example24.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,47 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$graph->SetShadow(); +$graph->img->SetMargin(40,30,20,40); + +$b1plot = new BarPlot($data1y); +$b1plot->SetFillColor("orange"); +$b2plot = new BarPlot($data2y); +$b2plot->SetFillColor("blue"); +$b3plot = new BarPlot($data3y); +$b3plot->SetFillColor("green"); +$b4plot = new BarPlot($data4y); +$b4plot->SetFillColor("brown"); + +// Create the accumulated bar plots +$ab1plot = new AccBarPlot(array($b1plot,$b2plot)); +$ab2plot = new AccBarPlot(array($b3plot,$b4plot)); + +// Create the grouped bar plot +$gbplot = new GroupBarPlot(array($ab1plot,$ab2plot)); + +// ...and add it to the graph +$graph->Add($gbplot); + +$graph->title->Set("Grouped Accumulated bar plots"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example25.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example25.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example25.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example25.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +clearTheme(); +$graph->SetScale('textlin'); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->img->SetMargin(40,30,40,40); + +// Create a bar pot +$bplot = new BarPlot($datay); +$graph->Add($bplot); + +// Create and add a new text +$txt=new Text('This is a text'); +$txt->SetPos(10,20); +$txt->SetColor('darkred'); +$txt->SetFont(FF_FONT2,FS_BOLD); +$txt->SetBox('yellow','navy','gray@0.5'); +$graph->AddText($txt); + +// Setup the titles +$graph->title->Set("A simple bar graph"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example25.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example25.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example25.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example25.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +clearTheme(); +$graph->SetScale('textlin'); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->img->SetMargin(40,30,20,40); + +// Create a bar pot +$bplot = new BarPlot($datay); +$graph->Add($bplot); + +// Create and add a new text +$txt=new Text("This is a text\nwith many\nand even\nmore\nlines of text"); +$txt->SetPos(0.5,0.5,'center','center'); +$txt->SetFont(FF_FONT2,FS_BOLD); +$txt->ParagraphAlign('center'); +$txt->SetBox('yellow','navy','gray'); +$txt->SetColor('red'); +$graph->AddText($txt); + +// Setup the titles +$graph->title->Set("A simple bar graph"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example2.5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example2.5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example2.5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example2.5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,26 @@ +SetScale("textlin"); + +// Create the linear plot +$lineplot=new LinePlot($ydata); + +// Add the plot to the graph +$graph->Add($lineplot); + +$graph->img->SetMargin(40,20,20,40); +$graph->title->Set("Example 2.5"); +$graph->xaxis->title->Set("X-title"); +$graph->xaxis->SetPos("min"); +$graph->yaxis->title->Set("Y-title"); + + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example25.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example25.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example25.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example25.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +clearTheme(); +$graph->SetScale('textlin'); + +// Add a drop shadow +$graph->SetShadow(); + +// Adjust the margin a bit to make more room for titles +$graph->img->SetMargin(40,30,40,40); + +// Create a bar pot +$bplot = new BarPlot($datay); +$graph->Add($bplot); + +// Create and add a new text +$txt=new Text('This is a text'); +$txt->SetPos(0,20); +$txt->SetColor('darkred'); +$txt->SetFont(FF_FONT2,FS_BOLD); +$graph->AddText($txt); + +// Setup the titles +$graph->title->Set("A simple bar graph"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example26.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example26.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example26.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example26.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +clearTheme(); +$graph->SetShadow(); + +$graph->title->Set("A simple Pie plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new PiePlot($data); +$p1->SetLegends($gDateLocale->GetShortMonth()); +$p1->SetCenter(0.4); + +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example2.6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example2.6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example2.6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example2.6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,27 @@ +SetScale("textlin"); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetStepStyle(); + +// Add the plot to the graph +$graph->Add($lineplot); + +$graph->img->SetMargin(40,20,20,40); +$graph->title->Set("Example 2.6 (Line with stepstyle)"); +$graph->xaxis->title->Set("X-title"); +$graph->xaxis->SetPos("min"); +$graph->yaxis->title->Set("Y-title"); + + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example26.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example26.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example26.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example26.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,17 @@ +clearTheme(); +$graph->SetShadow(); + +$graph->title->Set("A simple Pie plot"); + +$p1 = new PiePlot($data); +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example27.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example27.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example27.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example27.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,24 @@ +clearTheme(); +$graph->SetShadow(); + +$graph->title->Set("A simple Pie plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new PiePlot3D($data); +$p1->SetAngle(20); +$p1->SetSize(0.5); +$p1->SetCenter(0.45); +$p1->SetLegends($gDateLocale->GetShortMonth()); + +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example27.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example27.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example27.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example27.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +clearTheme(); +$graph->SetShadow(); + +$graph->title->Set("A simple Pie plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new PiePlot($data); +$p1->ExplodeSlice(1); +$p1->SetCenter(0.45); +$p1->SetLegends($gDateLocale->GetShortMonth()); + +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example27.3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example27.3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example27.3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example27.3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +clearTheme(); +$graph->SetShadow(); + +$graph->title->Set("A simple 3D Pie plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new PiePlot3D($data); +$p1->ExplodeSlice(1); +$p1->SetCenter(0.45); +$p1->SetLegends($gDateLocale->GetShortMonth()); + +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example27.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example27.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example27.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example27.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +clearTheme(); +$graph->SetShadow(); + +$graph->title->Set("A simple Pie plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new PiePlot3D($data); +$p1->SetSize(0.5); +$p1->SetCenter(0.45); +$p1->SetLegends($gDateLocale->GetShortMonth()); + +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example28.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example28.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example28.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example28.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +clearTheme(); +$graph->SetShadow(); + +$graph->title->Set("'earth' Theme"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new PiePlot($data); +$p1->SetTheme("earth"); +$p1->SetCenter(0.5,0.55); +$p1->value->Show(false); +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example28.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example28.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example28.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example28.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +clearTheme(); +$graph->SetShadow(); + +$graph->title->Set("'pastel' Theme"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new PiePlot($data); +$p1->SetTheme("pastel"); +$p1->SetCenter(0.5,0.55); +$p1->value->Show(false); +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example28.3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example28.3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example28.3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example28.3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +clearTheme(); +$graph->SetShadow(); + +$graph->title->Set("'water' Theme"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new PiePlot($data); +$p1->SetTheme("water"); +$p1->SetCenter(0.5,0.55); +$p1->value->Show(false); +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example28.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example28.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example28.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example28.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +clearTheme(); +$graph->SetShadow(); + +$graph->title->Set("'sand' Theme"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new PiePlot($data); +$p1->SetTheme("sand"); +$p1->SetCenter(0.5,0.55); +$p1->value->Show(false); +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ +SetScale('intlin'); + +// Setup margin and titles +$graph->SetMargin(40,20,20,40); +$graph->title->Set('Calls per operator'); +$graph->subtitle->Set('(March 12, 2008)'); +$graph->xaxis->title->Set('Operator'); +$graph->yaxis->title->Set('# of calls'); + + +// Create the linear plot +$lineplot=new LinePlot($ydata); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +clearTheme(); +$graph->SetScale('intlin'); +$graph->SetShadow(); + +// Setup margin and titles +$graph->SetMargin(40,20,20,40); +$graph->title->Set('Calls per operator'); +$graph->subtitle->Set('(March 12, 2008)'); +$graph->xaxis->title->Set('Operator'); +$graph->yaxis->title->Set('# of calls'); + +$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD ); +$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD ); + +$graph->yaxis->SetColor('blue'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor( 'blue' ); +$lineplot->SetWeight( 2 ); // Two pixel wide + + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +clearTheme(); +$graph->SetScale('intlin'); +$graph->SetShadow(); + +// Setup margin and titles +$graph->SetMargin(40,20,20,40); +$graph->title->Set('Interpolated values'); +$graph->xaxis->title->Set('x-title'); +$graph->yaxis->title->Set('y-title'); + +$graph->yaxis->title->SetFont( FF_ARIAL , FS_BOLD, 9 ); +$graph->xaxis->title->SetFont( FF_ARIAL , FS_BOLD, 9 ); + +$graph->yaxis->SetColor('blue'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor( 'blue' ); +$lineplot->SetWeight( 2 ); // Two pixel wide + + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.0.3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +clearTheme(); +$graph->SetScale('intlin'); +$graph->SetShadow(); + +// Setup margin and titles +$graph->SetMargin(40,20,20,40); +$graph->title->Set('NULL values'); +$graph->xaxis->title->Set('x-title'); +$graph->yaxis->title->Set('y-title'); + +$graph->yaxis->title->SetFont( FF_ARIAL , FS_BOLD, 9 ); +$graph->xaxis->title->SetFont( FF_ARIAL , FS_BOLD, 9 ); + +$graph->yaxis->SetColor('blue'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor( 'blue' ); +$lineplot->SetWeight( 2 ); // Two pixel wide + + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.1.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.1.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.1.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.1.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,44 @@ +clearTheme(); +$graph->SetScale('intlin'); +$graph->SetShadow(); + +// Setup margin and titles +$graph->SetMargin(40,20,20,40); +$graph->title->Set('Calls per operator'); +$graph->subtitle->Set('(March 12, 2008)'); +$graph->xaxis->title->Set('Operator'); +$graph->yaxis->title->Set('# of calls'); + +$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD ); +$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD ); + +$graph->yaxis->SetColor('blue'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor( 'blue' ); +$lineplot->SetWeight( 2 ); // Two pixel wide + +// Add an image mark scaled to 50% +$lineplot->mark->SetType(MARK_IMG_DIAMOND,'red',0.5); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,44 @@ +clearTheme(); +$graph->SetScale('intlin'); +$graph->SetShadow(); + +// Setup margin and titles +$graph->SetMargin(40,20,20,40); +$graph->title->Set('Calls per operator'); +$graph->subtitle->Set('(March 12, 2008)'); +$graph->xaxis->title->Set('Operator'); +$graph->yaxis->title->Set('# of calls'); + +$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD ); +$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD ); + +$graph->yaxis->SetColor('blue'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor( 'blue' ); +$lineplot->SetWeight( 2 ); // Two pixel wide +$lineplot->mark->SetType(MARK_UTRIANGLE); +$lineplot->mark->SetColor('blue'); +$lineplot->mark->SetFillColor('red'); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->yaxis->scale->SetGrace(10,10); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->mark->SetType(MARK_CIRCLE); + +// Add the plot to the graph +$graph->Add($lineplot); + +$graph->img->SetMargin(40,20,20,40); +$graph->title->Set("Grace value, version 1"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); +$graph->yaxis->SetWeight(2); +$graph->SetShadow(); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->yaxis->scale->SetGrace(10,10); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->mark->SetType(MARK_CIRCLE); + +// Add the plot to the graph +$graph->Add($lineplot); + +$graph->img->SetMargin(40,20,20,40); +$graph->title->Set("Grace value version 2"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->xaxis->SetPos('min'); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); +$graph->yaxis->SetWeight(2); +$graph->SetShadow(); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,35 @@ +clearTheme(); +$graph->SetScale("textlin"); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->mark->SetType(MARK_CIRCLE); + +// Add the plot to the graph +$graph->Add($lineplot); + +$graph->img->SetMargin(40,20,20,40); +$graph->title->Set("Example 3.2"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); +$graph->yaxis->SetWeight(2); +$graph->SetShadow(); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +clearTheme(); +$graph->SetScale('intlin'); +$graph->SetShadow(); + +// Setup margin and titles +$graph->SetMargin(40,20,20,40); +$graph->title->Set('Calls per operator'); +$graph->subtitle->Set('(March 12, 2008)'); +$graph->xaxis->title->Set('Operator'); +$graph->yaxis->title->Set('# of calls'); + +$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD ); +$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD ); + +$graph->yaxis->SetColor('blue'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor( 'blue' ); +$lineplot->SetWeight( 2 ); // Two pixel wide +$lineplot->mark->SetType(MARK_UTRIANGLE); +$lineplot->mark->SetColor('blue'); +$lineplot->mark->SetFillColor('red'); + +$lineplot->value->Show(); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.4.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.4.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.4.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.4.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,82 @@ + 1000, 'CM' => 900, 'D' => 500, 'CD' => 400, + 'C' => 100, 'XC' => 90, 'L' => 50, 'XL' => 40, + 'X' => 10, 'IX' => 9, 'V' => 5, 'IV' => 4, 'I' => 1); + + foreach ($lookup as $roman => $value) + { + // Determine the number of matches + $matches = intval($n / $value); + + // Store that many characters + $result .= str_repeat($roman, $matches); + + // Substract that from the number + $n = $n % $value; + } + + // The Roman numeral should be built, return it + return $result; +} + +function formatCallback($aVal) { + return '('.numberToRoman($aVal).')'; +} + + + // Some (random) data +$ydata = array(11,3,8,12,5,1,9,13,5,7); + +// Size of the overall graph +$width=350; +$height=250; + +// Create the graph and set a scale. +// These two calls are always required +$graph = new Graph($width,$height); +$graph->clearTheme(); +$graph->SetScale('intlin'); +$graph->SetShadow(); + +// Setup margin and titles +$graph->SetMargin(40,20,20,40); +$graph->title->Set('Calls per operator'); +$graph->subtitle->Set('(March 12, 2008)'); +$graph->xaxis->title->Set('Operator'); +$graph->yaxis->title->Set('# of calls'); + +$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD ); +$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD ); + +$graph->yaxis->SetColor('blue'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor( 'blue' ); +$lineplot->SetWeight( 2 ); // Two pixel wide +$lineplot->mark->SetType(MARK_UTRIANGLE); +$lineplot->mark->SetColor('blue'); +$lineplot->mark->SetFillColor('red'); + +$lineplot->value->Show(); +$lineplot->value->SetFont(FF_ARIAL,FS_BOLD,10); +$lineplot->value->SetColor('darkred'); +$lineplot->value->SetFormatCallback('formatCallback'); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +clearTheme(); +$graph->SetScale('intlin'); +$graph->SetShadow(); + +// Setup margin and titles +$graph->SetMargin(40,20,20,40); +$graph->title->Set('Calls per operator'); +$graph->subtitle->Set('(March 12, 2008)'); +$graph->xaxis->title->Set('Operator'); +$graph->yaxis->title->Set('# of calls'); + +$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD ); +$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD ); + +$graph->yaxis->SetColor('blue'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor( 'blue' ); +$lineplot->SetWeight( 2 ); // Two pixel wide +$lineplot->mark->SetType(MARK_UTRIANGLE); +$lineplot->mark->SetColor('blue'); +$lineplot->mark->SetFillColor('red'); + +$lineplot->value->Show(); +$lineplot->value->SetFont(FF_ARIAL,FS_BOLD,10); +$lineplot->value->SetColor('darkred'); +$lineplot->value->SetFormat('(%d)'); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +clearTheme(); +$graph->SetScale('intlin'); + +// Setup margin and titles +$graph->SetMargin(40,20,20,40); +$graph->title->Set('Calls per operator'); +$graph->subtitle->Set('(March 12, 2008)'); +$graph->xaxis->title->Set('Operator'); +$graph->yaxis->title->Set('# of calls'); + +$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD ); +$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD ); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor( 'blue' ); +$lineplot->SetWeight( 2 ); // Two pixel wide + + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +clearTheme(); +$graph->SetScale('intlin'); +$graph->SetShadow(); + +// Setup margin and titles +$graph->SetMargin(40,20,20,40); +$graph->title->Set('Calls per operator (June,July)'); +$graph->subtitle->Set('(March 12, 2008)'); +$graph->xaxis->title->Set('Operator'); +$graph->yaxis->title->Set('# of calls'); + +$graph->yaxis->title->SetFont( FF_FONT1 , FS_BOLD ); +$graph->xaxis->title->SetFont( FF_FONT1 , FS_BOLD ); + +// Create the first data series +$lineplot=new LinePlot($ydata); +$lineplot->SetWeight( 2 ); // Two pixel wide + +// Add the plot to the graph +$graph->Add($lineplot); + +// Create the second data series +$lineplot2=new LinePlot($ydata2); +$lineplot2->SetWeight( 2 ); // Two pixel wide + +// Add the second plot to the graph +$graph->Add($lineplot2); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example5.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example5.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example5.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example5.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +clearTheme(); +$graph->img->SetMargin(40,40,20,40); +$graph->SetScale("textlin"); +$graph->SetY2Scale("lin"); +$graph->SetShadow(); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot2=new LinePlot($y2data); + +// Add the plot to the graph +$graph->Add($lineplot); +$graph->AddY2($lineplot2); +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); +$graph->y2axis->SetColor("orange"); + +$graph->title->Set("Example 5"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); + +$graph->yaxis->SetColor("blue"); + +$lineplot->SetLegend("Plot 1"); +$lineplot2->SetLegend("Plot 2"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,45 @@ +clearTheme(); +$graph->img->SetMargin(40,40,20,40); +$graph->SetScale("textlin"); +$graph->SetY2Scale("lin"); +$graph->SetShadow(); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot2=new LinePlot($y2data); + +// Add the plot to the graph +$graph->Add($lineplot); +$graph->AddY2($lineplot2); +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); +$graph->y2axis->SetColor("orange"); + +$graph->title->Set("Example 5"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); + +$graph->yaxis->SetColor("blue"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example6.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example6.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example6.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example6.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,56 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetY2Scale("lin"); +$graph->SetShadow(); + +// Adjust the margin +$graph->img->SetMargin(40,40,20,70); + +// Create the two linear plot +$lineplot=new LinePlot($ydata); +$lineplot2=new LinePlot($y2data); + +// Add the plot to the graph +$graph->Add($lineplot); +$graph->AddY2($lineplot2); +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); + +// Adjust the axis color +$graph->y2axis->SetColor("orange"); +$graph->yaxis->SetColor("blue"); + +$graph->title->Set("Example 6.1"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Set the colors for the plots +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); + +// Set the legends for the plots +$lineplot->SetLegend("Plot 1"); +$lineplot2->SetLegend("Plot 2"); + +// Adjust the legend position +$graph->legend->SetLayout(LEGEND_HOR); +$graph->legend->Pos(0.4,0.95,"center","bottom"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example6.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example6.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example6.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example6.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +// Adjust the margin +$graph->img->SetMargin(40,40,20,70); + +// Create the two linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetStepStyle(); + +// Adjust the axis color +$graph->yaxis->SetColor("blue"); + +$graph->title->Set("Example 6.2"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Set the colors for the plots +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +// Set the legends for the plots +$lineplot->SetLegend("Plot 1"); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Adjust the legend position +$graph->legend->SetLayout(LEGEND_HOR); +$graph->legend->Pos(0.4,0.95,"center","bottom"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,55 @@ +clearTheme(); +$graph->SetScale('textlin'); +$graph->SetY2Scale('lin'); +$graph->SetShadow(); + +// Adjust the margin +$graph->img->SetMargin(40,140,20,40); + +// Create the two linear plot +$lineplot=new LinePlot($ydata); +$lineplot2=new LinePlot($y2data); + +// Add the plot to the graph +$graph->Add($lineplot); +$graph->AddY2($lineplot2); +$lineplot2->SetColor('orange'); +$lineplot2->SetWeight(2); + +// Adjust the axis color +$graph->y2axis->SetColor('orange'); +$graph->yaxis->SetColor('blue'); + +$graph->title->Set('Example 6'); +$graph->xaxis->title->Set('X-title'); +$graph->yaxis->title->Set('Y-title'); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +// Set the colors for the plots +$lineplot->SetColor('blue'); +$lineplot->SetWeight(2); +$lineplot2->SetColor('orange'); +$lineplot2->SetWeight(2); + +// Set the legends for the plots +$lineplot->SetLegend('Plot 1'); +$lineplot2->SetLegend('Plot 2'); + +// Adjust the legend position +$graph->legend->Pos(0.05,0.5,'right','center'); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,45 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetY2Scale("log"); +$graph->SetShadow(); +$graph->img->SetMargin(40,110,20,40); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot2=new LinePlot($y2data); + +// Add the plot to the graph +$graph->Add($lineplot); +$graph->AddY2($lineplot2); +$graph->yaxis->SetColor('blue'); + +$graph->title->Set("Example 7"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); +$lineplot2->SetWeight(2); + +$lineplot->SetLegend("Plot 1"); +$lineplot2->SetLegend("Plot 2"); + +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example8.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example8.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example8.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example8.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ +clearTheme(); +$graph->SetScale("textlog"); +$graph->SetY2Scale("log"); + +$graph->SetShadow(); +$graph->SetMargin(40,110,20,40); + +$graph->ygrid->Show(true,true); +$graph->xgrid->Show(true,false); + +// Create the linear plot +$lineplot=new LinePlot($ydata); + +$lineplot2=new LinePlot($y2data); +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); + +$graph->yaxis->scale->ticks->SupressFirst(); + +// Add the plot to the graph +$graph->Add($lineplot); +$graph->AddY2($lineplot2); + +$graph->title->Set("Example 8"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); + +$graph->yaxis->SetColor("blue"); +$graph->y2axis->SetColor("orange"); + +$lineplot->SetLegend("Plot 1"); +$lineplot2->SetLegend("Plot 2"); + +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example8.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example8.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example8.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example8.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +clearTheme(); +$graph->SetScale("textlog"); +$graph->SetShadow(); +$graph->img->SetMargin(40,110,20,40); + +// Show the gridlines +$graph->ygrid->Show(true,true); +$graph->xgrid->Show(true,false); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot2=new LinePlot($y2data); + +// Add the plot to the graph +$graph->Add($lineplot); + +$graph->title->Set("Example 8"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +// Adjust the color of the Y axis +$graph->yaxis->SetColor("blue"); + +// Specifya a legend +$lineplot->SetLegend("Plot 1"); + +// Adjust the position of the grid box +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example9.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example9.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example9.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example9.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +clearTheme(); +$graph->SetScale("textlog"); + +$graph->img->SetMargin(40,110,20,40); +$graph->SetShadow(); + +$graph->ygrid->Show(true,true); +$graph->xgrid->Show(true,false); + +// Specify the tick labels +$a = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($a); +$graph->xaxis->SetTextLabelInterval(2); + +// Create the linear plot +$lineplot=new LinePlot($ydata); + +// Add the plot to the graph +$graph->Add($lineplot); + +$graph->title->Set("Examples 9"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +$graph->yaxis->SetColor("blue"); + +$lineplot->SetLegend("Plot 1"); + +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example9.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example9.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example9.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example9.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +clearTheme(); +$graph->SetScale("textlog"); + +$graph->img->SetMargin(40,110,20,50); +$graph->SetShadow(); + +$graph->ygrid->Show(true,true); +$graph->xgrid->Show(true,false); + +// Specify the tick labels +$a = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($a); +//$graph->xaxis->SetTextLabelInterval(2); +$graph->xaxis->SetLabelAngle(90); + + +// Create the linear plot +$lineplot=new LinePlot($ydata); + +// Add the plot to the graph +$graph->Add($lineplot); + +$graph->title->Set("Examples 9"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +$graph->yaxis->SetColor("blue"); + +$lineplot->SetLegend("Plot 1"); + +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example9.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example9.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/example9.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/example9.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +clearTheme(); +$graph->SetScale("textlog"); + +$graph->img->SetMargin(40,110,20,40); +$graph->SetShadow(); + +$graph->ygrid->Show(true,true); +$graph->xgrid->Show(true,false); + +// Specify the tick labels +$a = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($a); + +// Create the linear plot +$lineplot=new LinePlot($ydata); + +// Add the plot to the graph +$graph->Add($lineplot); + +$graph->title->Set("Examples 9"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +$graph->yaxis->SetColor("blue"); + +$lineplot->SetLegend("Plot 1"); + +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/exampleex9.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/exampleex9.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/exampleex9.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/exampleex9.php 2020-11-10 01:50:04.000000000 +0000 @@ -0,0 +1,63 @@ +SetScale("textlog"); + +$graph->img->SetMargin(40,110,20,40); + +$graph->SetY2Scale("log"); +$graph->SetShadow(); + +$graph->ygrid->Show(true,true); +$graph->xgrid->Show(true,false); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot2=new LinePlot($y2data); + +$graph->yaxis->scale->ticks->SupressFirst(); +$graph->y2axis->scale->ticks->SupressFirst(); +// Add the plot to the graph +$graph->Add($lineplot); +$graph->AddY2($lineplot2); +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); +$graph->y2axis->SetColor("orange"); + +$graph->title->Set("Examples 9"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); + +$graph->yaxis->SetColor("blue"); + +$lineplot->SetLegend("Plot 1"); +$lineplot2->SetLegend("Plot 2"); + +$graph->legend->Pos(0.05,0.5,"right","center"); + +$graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetTextTickInterval(2); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/fieldscatterex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/fieldscatterex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/fieldscatterex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/fieldscatterex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,91 @@ + 1 ) $f=1; + $red = floor((1-$f)*255); + $blue = floor($f*255); + $color = array($red,0,$blue); + //echo "x=$x, y=$y, blue=$blue, red=$red
"; + return array($color,$size,$arrowsize); +} + +// Create data for a simulated pseudo-magnetic radient field +$datax = array(); +$datay = array(); +$angle = array(); +for($x=1; $x < 10; ++$x ) { + for($y=10; $y<100; $y += 10) { + $a = -1; + if( $x==$polex && $y==$poley ) continue; + if( $x==$polex ) { + if( $y > $poley ) $a=90; + else $a = 270; + } + if( $y==$poley ) { + if( $x > $polex ) $a=0; + else $a=180; + } + if( $a == -1 ) { + $d1 = $y-$poley; + $d2 = ($polex-$x)*20; + if( $y < $poley ) $d2 *= -1; + $h = sqrt($d1*$d1+$d2*$d2); + $t = -$d2/$h; + $ac = acos($t); + if( $y < $poley ) $ac += M_PI; + $a = $ac * 180/M_PI; + } + $datax[] = $x; + $datay[] = $y; + $angle[] = $a; + } +} + +// Setup the graph +$graph = new Graph(300,200); +$graph->clearTheme(); +$graph->SetScale("intlin",0,100,0,10); +$graph->SetMarginColor('lightblue'); + + +// ..and titles +$graph->title->Set("Field plot"); + +// Setup the field plot +$fp = new FieldPlot($datay,$datax,$angle); + +// Setup formatting callback +$fp->SetCallback('FldCallback'); + +// First size argument is length (in pixels of arrow) +// Second size argument is roughly size of arrow. Arrow size is specified as +// an integer in the range [0,9] +$fp->arrow->SetSize(20,2); +$fp->arrow->SetColor('navy'); + +$graph->Add($fp); + +// .. and output +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledgridex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledgridex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledgridex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledgridex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +clearTheme(); +$graph->SetMarginColor('white'); +$graph->SetScale("textlin"); +$graph->SetFrame(false); +$graph->SetMargin(30,50,30,30); + +$graph->title->Set('Filled Y-grid'); + + +$graph->yaxis->HideZeroLabel(); +$graph->ygrid->SetFill(true,'#EFEFEF@0.5','#BBCCFF@0.5'); +$graph->xgrid->Show(); + +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +// Create the first line +$p1 = new LinePlot($datay1); +$p1->SetColor("navy"); +$p1->SetLegend('Line 1'); +$graph->Add($p1); + +// Create the second line +$p2 = new LinePlot($datay2); +$p2->SetColor("red"); +$p2->SetLegend('Line 2'); +$graph->Add($p2); + +// Create the third line +$p3 = new LinePlot($datay3); +$p3->SetColor("orange"); +$p3->SetLegend('Line 3'); +$graph->Add($p3); + +$graph->legend->SetShadow('gray@0.4',5); +$graph->legend->SetPos(0.1,0.1,'right','top'); +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledline01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledline01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledline01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledline01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,24 @@ +img->SetMargin(40,40,40,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->title->Set("Example of filled line plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new LinePlot($datay); +$p1->SetFillColor("orange"); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$graph->Add($p1); + +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex01.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex01.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex01.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex01.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,25 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$graph->img->SetMargin(40,40,40,40); +$graph->SetShadow(); +$graph->SetGridDepth(DEPTH_FRONT); + +$graph->title->Set("Example of filled line plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new LinePlot($datay); +$p1->SetFillColor("orange"); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$graph->Add($p1); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +SetScale('textlin'); + +$graph->img->SetMargin(40,40,40,40); +$graph->SetShadow(); + +$graph->title->Set("Example of filled line plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new LinePlot($datay); +$p1->SetFillColor("orange"); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$graph->Add($p1); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,24 @@ +img->SetMargin(40,40,40,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->title->Set("Example of filled line plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->subtitle->Set("(Starting from Y=0)"); + +$graph->yaxis->scale->SetAutoMin(0); + +$p1 = new LinePlot($datay); +$p1->SetFillColor("orange"); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$graph->Add($p1); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledlineex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +SetScale('intlin'); +$graph->title->Set('Filled line with NULL values'); +//Make sure data starts from Zero whatever data we have +$graph->yscale->SetAutoMin(0); + +$p1 = new LinePlot($datay); +$p1->SetFillColor('lightblue'); +$graph->Add($p1); + +// Output line +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledstepstyleex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledstepstyleex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/filledstepstyleex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/filledstepstyleex1.php 2020-11-04 05:47:57.000000000 +0000 @@ -0,0 +1,40 @@ +clearTheme(); + +$ydata = array(5,10,15,20,15,10); + +$graph->SetScale("textlin"); +$graph->SetShadow(true); +$graph->SetMarginColor("antiquewhite"); +$graph->img->SetMargin(60,40,40,50); +$graph->img->setTransparent("white"); +$graph->xaxis->SetFont(FF_FONT1); +$graph->xaxis->setTextTickInterval(1); +$graph->xaxis->SetTextLabelInterval(1); +$graph->legend->SetFillColor("antiquewhite"); +$graph->legend->SetShadow(true); +$graph->legend->SetLayout(LEGEND_VERT); +$graph->legend->Pos(0.02,0.01); +$graph->title->Set("Step Styled Example"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot = new LinePlot($ydata); +$lineplot->SetColor("black"); +$lineplot->setFillColor("gray7"); +$lineplot->SetStepStyle(); +$lineplot->SetLegend(" 2002 "); + +// add plot to the graph +$graph->Add($lineplot); +$graph->ygrid->show(false,false); + +// display graph +$graph->Stroke(); + +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/fireplace.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/fireplace.jpg differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/fixscale_radarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/fixscale_radarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/fixscale_radarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/fixscale_radarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +SetScale('lin',0,50); +$graph->yscale->ticks->Set(25,5); +$graph->SetColor('white'); +$graph->SetShadow(); + +$graph->SetCenter(0.5,0.55); + +$graph->axis->SetFont(FF_FONT1,FS_BOLD); +$graph->axis->SetWeight(2); + +// Uncomment the following lines to also show grid lines. +$graph->grid->SetLineStyle('dashed'); +$graph->grid->SetColor('navy@0.5'); +$graph->grid->Show(); + +$graph->ShowMinorTickMarks(); + +$graph->title->Set('Quality result'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->SetTitles(array('One','Two','Three','Four','Five','Sex','Seven','Eight','Nine','Ten')); + +$plot = new RadarPlot(array(12,35,20,30,33,15,37)); +$plot->SetLegend('Goal'); +$plot->SetColor('red','lightred'); +$plot->SetFillColor('lightblue'); +$plot->SetLineWeight(2); + +$graph->Add($plot); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/footerex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/footerex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/footerex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/footerex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,61 @@ +clearTheme(); +$graph->SetMarginColor('white'); +$graph->SetScale("textlin"); +$graph->SetFrame(false); +$graph->SetMargin(30,5,25,50); + +// Setup the tab +$graph->tabtitle->Set(' Year 2003 ' ); +$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,13); +$graph->tabtitle->SetColor('darkred','#E1E1FF'); + +// Enable X-grid as well +$graph->xgrid->Show(); + +// Use months as X-labels +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +$graph->footer->left->Set('L. footer'); +$graph->footer->left->SetFont(FF_ARIAL,FS_NORMAL,12); +$graph->footer->left->SetColor('darkred'); +$graph->footer->center->Set('C. footer'); +$graph->footer->center->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->footer->center->SetColor('darkred'); +$graph->footer->right->Set('R. footer'); +$graph->footer->right->SetFont(FF_ARIAL,FS_NORMAL,12); +$graph->footer->right->SetColor('darkred'); + +// Create the plot +$p1 = new LinePlot($datay1); +$p1->SetColor("navy"); + +// Use an image of favourite car as marker +$p1->mark->SetType(MARK_IMG,'saab_95.jpg',0.5); + +// Displayes value on top of marker image +$p1->value->SetFormat('%d mil'); +$p1->value->Show(); +$p1->value->SetColor('darkred'); +$p1->value->SetFont(FF_ARIAL,FS_BOLD,10); +// Increase the margin so that the value is printed avove tje +// img marker +$p1->value->SetMargin(14); + +// Incent the X-scale so the first and last point doesn't +// fall on the edges +$p1->SetCenter(); + +$graph->Add($p1); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/funcex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/funcex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/funcex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/funcex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,57 @@ +E(-1.2*M_PI,1.2*M_PI); + +$f = new FuncGenerator('$x*$x'); +list($x2data,$y2data) = $f->E(-2,2); + +// Setup the basic graph +$graph = new Graph(450,350); +$graph->clearTheme(); +$graph->SetScale("linlin"); +$graph->SetShadow(); +$graph->img->SetMargin(50,50,60,40); +$graph->SetBox(true,'black',2); +$graph->SetMarginColor('white'); +$graph->SetColor('lightyellow'); + +// ... and titles +$graph->title->Set('Example of Function plot'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->subtitle->Set("(With some more advanced axis formatting\nHiding first and last label)"); +$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL); +$graph->xgrid->Show(); + +$graph->yaxis->SetPos(0); +$graph->yaxis->SetWeight(2); +$graph->yaxis->HideZeroLabel(); +$graph->yaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->SetColor('black','darkblue'); +$graph->yaxis->HideTicks(true,false); +$graph->yaxis->HideFirstLastLabel(); + +$graph->xaxis->SetWeight(2); +$graph->xaxis->HideZeroLabel(); +$graph->xaxis->HideFirstLastLabel(); +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->SetColor('black','darkblue'); + +$lp1 = new LinePlot($ydata,$xdata); +$lp1->SetColor('blue'); +$lp1->SetWeight(2); + +$lp2 = new LinePlot($y2data,$x2data); +list($xm,$ym)=$lp2->Max(); +$lp2->SetColor('red'); +$lp2->SetWeight(2); + + +$graph->Add($lp1); +$graph->Add($lp2); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/funcex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/funcex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/funcex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/funcex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ +E(-M_PI,M_PI,25); + +$graph = new Graph(380,450); +$graph->clearTheme(); +$graph->SetScale("linlin"); +$graph->SetShadow(); +$graph->img->SetMargin(50,50,60,40); +$graph->SetBox(true,'black',2); +$graph->SetMarginColor('white'); +$graph->SetColor('lightyellow'); +$graph->SetAxisStyle(AXSTYLE_SIMPLE); + +//$graph->xaxis->SetLabelFormat('%.1f'); + +$graph->title->Set("Function plot with marker"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->subtitle->Set("(BOXOUT Axis style)"); +$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL); + +$lp1 = new LinePlot($ydata,$xdata); +$lp1->mark->SetType(MARK_FILLEDCIRCLE); +$lp1->mark->SetFillColor("red"); +$lp1->SetColor("blue"); + +$graph->Add($lp1); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/funcex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/funcex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/funcex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/funcex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +E(-M_PI,M_PI,25); + +$graph = new Graph(350,430); +$graph->clearTheme(); +$graph->SetScale("linlin"); +$graph->SetShadow(); +$graph->img->SetMargin(50,50,60,40); +$graph->SetBox(true,'black',2); +$graph->SetMarginColor('white'); +$graph->SetColor('lightyellow'); +$graph->SetAxisStyle(AXSTYLE_BOXIN); +$graph->xgrid->Show(); + + +//$graph->xaxis->SetLabelFormat('%.0f'); + +$graph->img->SetMargin(50,50,60,40); + +$graph->title->Set("Function plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->subtitle->Set("(BOXIN Axis style)"); +$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL); + +$lp1 = new LinePlot($ydata,$xdata); +$lp1->SetColor("blue"); +$lp1->SetWeight(2); + +$graph->Add($lp1); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/funcex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/funcex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/funcex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/funcex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,62 @@ +E(-1.2*M_PI,1.2*M_PI); + +$f = new FuncGenerator('$x*$x'); +list($x2data,$y2data) = $f->E(-2,2); + +// Setup the basic graph +$graph = new Graph(450,350); +$graph->clearTheme(); +$graph->SetScale("linlin"); +//$graph->SetShadow(); +$graph->img->SetMargin(5,10,60,9); +$graph->SetBox(true,'green',2); +$graph->SetMarginColor('black'); +$graph->SetColor('black'); + +// ... and titles +$graph->title->Set('Example of Function plot'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->title->SetColor('lightgreen'); +$graph->subtitle->Set("(With some more advanced axis formatting\nHiding first and last label)"); +$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL); +$graph->subtitle->SetColor('lightgreen'); + +$graph->xgrid->Show(); +$graph->xgrid->SetColor('darkgreen'); +$graph->ygrid->SetColor('darkgreen'); + +$graph->yaxis->SetPos(0); +$graph->yaxis->SetWeight(2); +$graph->yaxis->HideZeroLabel(); +$graph->yaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->SetColor('green','green'); +$graph->yaxis->HideTicks(true,true); +$graph->yaxis->HideFirstLastLabel(); + +$graph->xaxis->SetWeight(2); +$graph->xaxis->HideZeroLabel(); +$graph->xaxis->HideFirstLastLabel(); +$graph->xaxis->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->SetColor('green','green'); + +$lp1 = new LinePlot($ydata,$xdata); +$lp1->SetColor('yellow'); +$lp1->SetWeight(2); + +$lp2 = new LinePlot($y2data,$x2data); +list($xm,$ym)=$lp2->Max(); +$lp2->SetColor('blue'); +$lp2->SetWeight(2); + + +$graph->Add($lp1); +$graph->Add($lp2); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcolumnfontsex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcolumnfontsex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcolumnfontsex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcolumnfontsex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,68 @@ +SetMarginColor('gray:1.7'); +$graph->SetColor('white'); + +// Setup the graph title and title font +$graph->title->Set("Example of column fonts"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); + +// Show three headers +$graph->ShowHeaders(GANTT_HDAY | GANTT_HMONTH| GANTT_HYEAR); + +// Set the column headers and font +$graph->scale->actinfo->SetColTitles( array('Name','Start','End'),array(100)); +$graph->scale->actinfo->SetFont(FF_ARIAL,FS_BOLD,11); + +// Some "dummy" data to be dsiplayed +$data = array( + array(0,'Group 1', '2001-11-27','2001-12-05'), + array(1,' Activity 1', '2001-11-27','2001-11-29'), + array(2,' Activity 2', '2001-11-28','2001-12-05'), + array(3,'Group 2', '2001-11-29','2001-12-10'), + array(4,' Activity 1', '2001-11-29','2001-12-03'), + array(5,' Activity 2', '2001-12-01','2001-12-10'), + +); + +// Format and add the Gantt bars to the chart +$n = count($data); +for($i=0; $i < $n; ++$i) { + if( $i === 0 || $i === 3 ) { + // Format the group bars + $bar = new GanttBar($data[$i][0],array($data[$i][1],$data[$i][2],$data[$i][3]),$data[$i][2],$data[$i][3],'',0.35); + + // For each group make the name bold but keep the dates as the default font + $bar->title->SetColumnFonts(array(array(FF_ARIAL,FS_BOLD,11))); + + // Add group markers + $bar->leftMark->SetType( MARK_LEFTTRIANGLE ); + $bar->leftMark->Show(); + $bar->rightMark->SetType( MARK_RIGHTTRIANGLE ); + $bar->rightMark->Show(); + $bar->SetFillColor('black'); + $bar->SetPattern(BAND_SOLID,'black'); + } + else { + // Format the activity bars + $bar = new GanttBar($data[$i][0],array($data[$i][1],$data[$i][2],$data[$i][3]),$data[$i][2],$data[$i][3],'',0.45); + $bar->SetPattern(BAND_RDIAG,'black'); + $bar->SetFillColor('orange'); + } + // Default font + $bar->title->SetFont(FF_ARIAL,FS_NORMAL,10); + $graph->Add($bar); +} + +// Send back the graph to the client +$graph->Stroke(); +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +title->Set("Example with grouping and constrains"); + +// Setup scale +$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK); +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAYWNBR); + +// Add the specified activities +$graph->CreateSimple($data,$constrains,$progress); + +// .. and stroke the graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +title->Set("Example with grouping and constrains"); + +// Setup scale +$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK); +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAYWNBR); + +// Add the specified activities +$graph->CreateSimple($data,$constrains,$progress); + +// .. and stroke the graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttconstrainex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +title->Set("Example with grouping and constrains"); +//$graph->SetFrame(false); + +// Setup scale +$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK); +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAYWNBR); + +// Add the specified activities +$graph->CreateSimple($data,$constrains,$progress); + +// .. and stroke the graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcsimex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcsimex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcsimex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcsimex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,28 @@ +SetCSIMTarget('#','Go back 1'); +$bar1->title->SetCSIMTarget('#','Go back 1 (title)'); +$bar2 = new GanttBar(1,"Activity 2","2002-01-03","2002-01-25"); +$bar2->SetCSIMTarget('#','Go back 2'); +$bar2->title->SetCSIMTarget('#','Go back 2 (title)'); + +$graph = new GanttGraph(500); +$graph->title->Set("Example with image map"); +$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK); +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); +$graph->scale->week->SetFont(FF_FONT1); + +$graph->Add(array($bar1,$bar2)); + +// And stroke +$graph->StrokeCSIM(); + + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcsimex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcsimex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcsimex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttcsimex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +title->Set("Example with image map"); +$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK); +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); +$graph->scale->week->SetFont(FF_FONT1); + +$graph->CreateSimple($data,$constrains,$progress); + +// Add the specified activities +//SetupSimpleGantt($graph,$data,$constrains,$progress); + +// And stroke +$graph->StrokeCSIM(); + + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex00.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex00.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex00.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex00.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,14 @@ +Add($activity); + +// Display the Gantt chart +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set('A main title'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set('(Draft version)'); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,'Activity 1','2001-12-21','2002-01-18'); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_LDIAG,'yellow'); +$activity->SetFillColor('red'); + +// Finally add the bar to the graph +$graph->Add($activity); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("Main title"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// Show day, week and month scale +//$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); +$graph->ShowHeaders(GANTT_HWEEK ); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_WNBR); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Finally add the bar to the graph +$graph->Add($activity); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("A nice main title"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(Draft version)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(7,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Finally add the bar to the graph +$graph->Add($activity); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex04.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex04.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex04.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex04.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,47 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("A nice main title"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(Draft version)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-01-20"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Finally add the bar to the graph +$graph->Add($activity); + +// Create a miletone +$milestone = new MileStone(2,"Milestone",'2002-01-09','MS5'); +$milestone->caption->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->Add($milestone); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex05.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex05.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex05.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex05.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("A nice main title"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(Draft version)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Finally add the bar to the graph +$graph->Add($activity); + +// Create a miletone +$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15"); +$milestone->title->SetColor("black"); +$milestone->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Add($milestone); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex06.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex06.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex06.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex06.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,52 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("A nice main title"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(Draft version)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Finally add the bar to the graph +$graph->Add($activity); + +// Create a miletone +$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15"); +$milestone->title->SetColor("black"); +$milestone->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Add($milestone); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex07.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex07.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex07.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex07.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("A nice main title"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(Draft version)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Finally add the bar to the graph +$graph->Add($activity); + +// Create a miletone +$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15"); +$milestone->title->SetColor("black"); +$milestone->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Add($milestone); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex08.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex08.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex08.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex08.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,63 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("A nice main title"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(Draft version)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-01-15"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Add a right marker +$activity->rightMark->Show(); +$activity->rightMark->SetType(MARK_FILLEDCIRCLE); +$activity->rightMark->SetWidth(13); +$activity->rightMark->SetColor("red"); +$activity->rightMark->SetFillColor("red"); +$activity->rightMark->title->Set("M5"); +$activity->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12); +$activity->rightMark->title->SetColor("white"); + +// Finally add the bar to the graph +$graph->Add($activity); + +// Create a miletone +$milestone = new MileStone(2,"Milestone","2002-01-10","2002-01-10"); +$milestone->title->SetColor("black"); +$milestone->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Add($milestone); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex09.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex09.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex09.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex09.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,66 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("A nice main title"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(Draft version)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Add a right marker +$activity->rightMark->Show(); +$activity->rightMark->SetType(MARK_FILLEDCIRCLE); +$activity->rightMark->SetWidth(13); +$activity->rightMark->SetColor("red"); +$activity->rightMark->SetFillColor("red"); +$activity->rightMark->title->Set("M5"); +$activity->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12); +$activity->rightMark->title->SetColor("white"); + +// Set absolute height +$activity->SetHeight(8); + +// Finally add the bar to the graph +$graph->Add($activity); + +// Create a miletone +$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15"); +$milestone->title->SetColor("black"); +$milestone->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Add($milestone); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex10.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex10.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex10.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex10.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,90 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("A nice main title"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(Draft version)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Add a right marker +$activity->rightMark->Show(); +$activity->rightMark->SetType(MARK_FILLEDCIRCLE); +$activity->rightMark->SetWidth(13); +$activity->rightMark->SetColor("red"); +$activity->rightMark->SetFillColor("red"); +$activity->rightMark->title->Set("M5"); +$activity->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12); +$activity->rightMark->title->SetColor("white"); + +// Set absolute height +$activity->SetHeight(1); + + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Add a right marker +$activity2->rightMark->Show(); +$activity2->rightMark->SetType(MARK_FILLEDCIRCLE); +$activity2->rightMark->SetWidth(13); +$activity2->rightMark->SetColor("red"); +$activity2->rightMark->SetFillColor("red"); +$activity2->rightMark->title->Set("M5"); +$activity2->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12); +$activity2->rightMark->title->SetColor("white"); + +// Set absolute height +$activity2->SetHeight(1); + + +// Finally add the bar to the graph +$graph->Add($activity); +$graph->Add($activity2); + +// Create a miletone +$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15"); +$milestone->title->SetColor("black"); +$milestone->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Add($milestone); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +//$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex11.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex11.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex11.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex11.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,89 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("A nice main title"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(Draft version)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Add a right marker +$activity->rightMark->Show(); +$activity->rightMark->SetType(MARK_FILLEDCIRCLE); +$activity->rightMark->SetWidth(13); +$activity->rightMark->SetColor("red"); +$activity->rightMark->SetFillColor("red"); +$activity->rightMark->title->Set("M5"); +$activity->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12); +$activity->rightMark->title->SetColor("white"); + +// Set absolute height +$activity->SetHeight(10); + + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Add a right marker +$activity2->rightMark->Show(); +$activity2->rightMark->SetType(MARK_FILLEDCIRCLE); +$activity2->rightMark->SetWidth(13); +$activity2->rightMark->SetColor("red"); +$activity2->rightMark->SetFillColor("red"); +$activity2->rightMark->title->Set("M5"); +$activity2->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12); +$activity2->rightMark->title->SetColor("white"); + +// Set absolute height +$activity2->SetHeight(10); + +// Finally add the bar to the graph +$graph->Add($activity); +$graph->Add($activity2); + +// Create a miletone +$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15"); +$milestone->title->SetColor("black"); +$milestone->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Add($milestone); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +//$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex12.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex12.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex12.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex12.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,93 @@ +SetBox(); +$graph->SetShadow(); + +// Add title and subtitle +$graph->title->Set("A nice main title"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(Draft version)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(0); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Add a right marker +$activity->rightMark->Show(); +$activity->rightMark->SetType(MARK_FILLEDCIRCLE); +$activity->rightMark->SetWidth(13); +$activity->rightMark->SetColor("red"); +$activity->rightMark->SetFillColor("red"); +$activity->rightMark->title->Set("M5"); +$activity->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12); +$activity->rightMark->title->SetColor("white"); + +// Set absolute height +$activity->SetHeight(10); + + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Project","2001-12-21","2002-02-20"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Add a right marker +$activity2->rightMark->Show(); +$activity2->rightMark->SetType(MARK_FILLEDCIRCLE); +$activity2->rightMark->SetWidth(13); +$activity2->rightMark->SetColor("red"); +$activity2->rightMark->SetFillColor("red"); +$activity2->rightMark->title->Set("M5"); +$activity2->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12); +$activity2->rightMark->title->SetColor("white"); + +// Set absolute height +$activity2->SetHeight(10); + +// Finally add the bar to the graph +$graph->Add($activity); +$graph->Add($activity2); + +// Create a miletone +$milestone = new MileStone(2,"Milestone","2002-01-15","2002-01-15"); +$milestone->title->SetColor("black"); +$milestone->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Add($milestone); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +//$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,64 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("Example of captions"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(ganttex13.php)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1); // 1=default value + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity1 = new GanttBar(0,"Activity 1","2001-12-21","2002-01-07","[ER,TR]"); + +// Yellow diagonal line pattern on a red background +$activity1->SetPattern(BAND_RDIAG,"yellow"); +$activity1->SetFillColor("red"); + +// Set absolute height of activity +$activity1->SetHeight(16); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Activity 2","2001-12-21","2002-01-01","[BO,SW,JC]"); + +// ADjust font for caption +$activity2->caption->SetFont(FF_ARIAL,FS_BOLD); +$activity2->caption->SetColor("darkred"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Set absolute height of activity +$activity2->SetHeight(16); + +// Finally add the bar to the graph +$graph->Add($activity1); +$graph->Add($activity2); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13-zoom1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13-zoom1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13-zoom1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13-zoom1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,67 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("Zooming a graph"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(zoom=0.7)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1.0); // 1=default value + +// Set zoom factor +$graph->SetZoomFactor(0.7); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity1 = new GanttBar(0,"Activity 1","2001-12-21","2002-01-07","[ER,TR]"); + +// Yellow diagonal line pattern on a red background +$activity1->SetPattern(BAND_RDIAG,"yellow"); +$activity1->SetFillColor("red"); + +// Set absolute height of activity +$activity1->SetHeight(16); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Activity 2","2001-12-21","2002-01-01","[BO,SW,JC]"); + +// ADjust font for caption +$activity2->caption->SetFont(FF_ARIAL,FS_BOLD); +$activity2->caption->SetColor("darkred"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Set absolute height of activity +$activity2->SetHeight(16); + +// Finally add the bar to the graph +$graph->Add($activity1); +$graph->Add($activity2); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13-zoom2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13-zoom2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13-zoom2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex13-zoom2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,67 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("Zooming a graph"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(zoom=1.5)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1.0); // 1=default value + +// Set zoom factor +$graph->SetZoomFactor(1.5); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity1 = new GanttBar(0,"Activity 1","2001-12-21","2002-01-07","[ER,TR]"); + +// Yellow diagonal line pattern on a red background +$activity1->SetPattern(BAND_RDIAG,"yellow"); +$activity1->SetFillColor("red"); + +// Set absolute height of activity +$activity1->SetHeight(16); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Activity 2","2001-12-21","2002-01-01","[BO,SW,JC]"); + +// ADjust font for caption +$activity2->caption->SetFont(FF_ARIAL,FS_BOLD); +$activity2->caption->SetColor("darkred"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Set absolute height of activity +$activity2->SetHeight(16); + +// Finally add the bar to the graph +$graph->Add($activity1); +$graph->Add($activity2); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex14.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex14.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex14.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex14.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,67 @@ +SetBox(); +$graph->SetShadow(); + +// Add title and subtitle +$graph->title->Set("Example of captions"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(ganttex14.php)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Set absolute height +$activity->SetHeight(10); + +// Specify progress to 60% +$activity->progress->Set(0.6); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Set absolute height +$activity2->SetHeight(10); + +// Specify progress to 30% +$activity2->progress->Set(0.3); + + +// Finally add the bar to the graph +$graph->Add($activity); +$graph->Add($activity2); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +//$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex15.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex15.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex15.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex15.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,68 @@ +SetBox(); +$graph->SetShadow(); + +// Add title and subtitle +$graph->title->Set("Example of captions"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(ganttex15.php)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Set absolute height +$activity->SetHeight(10); + +// Specify progress to 60% +$activity->progress->Set(0.6); +$activity->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Set absolute height +$activity2->SetHeight(10); + +// Specify progress to 30% +$activity2->progress->Set(0.3); +$activity2->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Finally add the bar to the graph +$graph->Add($activity); +$graph->Add($activity2); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +//$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex16.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex16.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex16.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex16.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,73 @@ +SetBox(); +$graph->SetShadow(); + +// Add title and subtitle +$graph->title->Set("Example of captions"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(ganttex16.php)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Set table title +$graph->scale->tableTitle->Set("(Rev: 1.22)"); +$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD); +$graph->scale->SetTableTitleBackground("silver"); +$graph->scale->tableTitle->Show(); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Set absolute height +$activity->SetHeight(10); + +// Specify progress to 60% +$activity->progress->Set(0.6); +$activity->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Set absolute height +$activity2->SetHeight(10); + +// Specify progress to 30% +$activity2->progress->Set(0.3); +$activity2->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Finally add the bar to the graph +$graph->Add($activity); +$graph->Add($activity2); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +//$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex17-flag.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex17-flag.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex17-flag.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex17-flag.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,88 @@ +SetBox(); +$graph->SetShadow(); + +// Add title and subtitle +$graph->title->Set("Example of captions"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(ganttex17.php)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Set table title +$graph->scale->tableTitle->Set("(Rev: 1.22)"); +$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD); +$graph->scale->SetTableTitleBackground("silver"); + +// Modify the appearance of the dividing lines +$graph->scale->divider->SetWeight(3); +$graph->scale->divider->SetColor("navy"); +$graph->scale->dividerh->SetWeight(3); +$graph->scale->dividerh->SetColor("navy"); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Set absolute height +$activity->SetHeight(10); + +// Specify progress to 60% +$activity->progress->Set(0.6); +$activity->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Set absolute height +$activity2->SetHeight(10); + +// Specify progress to 30% +$activity2->progress->Set(0.3); +$activity2->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Finally add the bar to the graph +$graph->Add($activity); +$graph->Add($activity2); + +// Add a coutnry flag +$icon = new IconPlot(); +$icon->SetAnchor('left','top'); +$icon->SetCountryFlag('norway'); +$icon->SetMix(50); +$icon->SetPos(5,5); +$graph->Add($icon); + + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +//$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex17.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex17.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex17.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex17.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,78 @@ +SetBox(); +$graph->SetShadow(); + +// Add title and subtitle +$graph->title->Set("Example of captions"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(ganttex17.php)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Set table title +$graph->scale->tableTitle->Set("(Rev: 1.22)"); +$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD); +$graph->scale->SetTableTitleBackground("silver"); + +// Modify the appearance of the dividing lines +$graph->scale->divider->SetWeight(3); +$graph->scale->divider->SetColor("navy"); +$graph->scale->dividerh->SetWeight(3); +$graph->scale->dividerh->SetColor("navy"); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Set absolute height +$activity->SetHeight(10); + +// Specify progress to 60% +$activity->progress->Set(0.6); +$activity->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Set absolute height +$activity2->SetHeight(10); + +// Specify progress to 30% +$activity2->progress->Set(0.3); +$activity2->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Finally add the bar to the graph +$graph->Add($activity); +$graph->Add($activity2); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +//$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex18.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex18.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex18.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex18.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,82 @@ +SetBox(); +$graph->SetShadow(); + +// Add title and subtitle +$graph->title->Set("Example of captions"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set("(ganttex18.php)"); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Set table title +$graph->scale->tableTitle->Set("(Rev: 1.22)"); +$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD); +$graph->scale->SetTableTitleBackground("silver"); + +// Modify the appearance of the dividing lines +$graph->scale->divider->SetWeight(3); +$graph->scale->divider->SetColor("navy"); + +$graph->scale->dividerh->SetWeight(3); +$graph->scale->dividerh->SetColor("navy"); + +$graph->SetBox(true,"navy",3); + + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Set absolute height +$activity->SetHeight(10); + +// Specify progress to 60% +$activity->progress->Set(0.6); +$activity->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Project","2001-12-21","2002-01-02","[30%]"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Set absolute height +$activity2->SetHeight(10); + +// Specify progress to 30% +$activity2->progress->Set(0.3); +$activity2->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Finally add the bar to the graph +$graph->Add($activity); +$graph->Add($activity2); + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +//$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex19.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex19.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex19.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex19.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,84 @@ +SetBox(); +$graph->SetShadow(); + +// Use default locale +$graph->scale->SetDateLocale(''); + +// Add title and subtitle +$graph->title->Set('Example of captions'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set('(ganttex19.php)'); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Set table title +$graph->scale->tableTitle->Set('(Rev: 1.22)'); +$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD); +$graph->scale->SetTableTitleBackground('silver'); +$graph->scale->tableTitle->Show(); + +$graph->scale->divider->SetStyle('solid'); +$graph->scale->divider->SetWeight(2); +$graph->scale->divider->SetColor('black'); + + +$graph->SetBox(true,'navy',2); + + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2); +$graph->scale->month->SetFontColor('white'); +$graph->scale->month->SetBackgroundColor('blue'); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,'Project','2001-12-21','2002-01-07','[50%]'); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,'yellow'); +$activity->SetFillColor('red'); + +// Set absolute height +$activity->SetHeight(10); + +// Specify progress to 60% +$activity->progress->Set(0.6); +$activity->progress->SetPattern(BAND_HVCROSS,'blue'); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,'Project','2001-12-21','2002-01-02','[30%]'); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,'yellow'); +$activity2->SetFillColor('red'); + +// Set absolute height +$activity2->SetHeight(10); + +// Specify progress to 30% +$activity2->progress->Set(0.3); +$activity2->progress->SetPattern(BAND_HVCROSS,'blue'); + +// Finally add the bar to the graph +$graph->Add($activity); +$graph->Add($activity2); + +// Add a vertical line +$vline = new GanttVLine('2001-12-24','Phase 1'); +$vline->SetDayOffset(0.5); +//$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex30.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex30.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex30.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex30.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,87 @@ +SetShadow(); +$graph->SetBox(); + +// Titles for chart +$graph->title->Set("General conversion plan"); +$graph->subtitle->Set("(Revision: 2001-11-18)"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// For illustration we enable all headers. +$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK); + +// For the week we choose to show the start date of the week +// the default is to show week number (according to ISO 8601) +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Change the scale font +$graph->scale->week->SetFont(FF_FONT0); +$graph->scale->year->SetFont(FF_ARIAL,FS_BOLD,12); + + +// Setup some data for the gantt bars +$data = array( + array(0,"Group 1", "2001-10-29","2001-11-27",FF_FONT1,FS_BOLD,8), + array(1," Label 2", "2001-11-8","2001-12-14"), + array(2," Label 3", "2001-11-01","2001-11-8"), + array(4,"Group 2", "2001-11-07","2001-12-19",FF_FONT1,FS_BOLD,8), + array(5," Label 4", "2001-11-8","2001-12-19"), + array(6," Label 5", "2001-11-01","2001-11-8") + ); + +for($i=0; $i4 ) + $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]); + + // If you like each bar can have a shadow + // $bar->SetShadow(true,"darkgray"); + + // For illustration lets make each bar be red with yellow diagonal stripes + $bar->SetPattern(BAND_RDIAG,"yellow"); + $bar->SetFillColor("red"); + + // To indicate progress each bar can have a smaller bar within + // For illustrative purpose just set the progress to 50% for each bar + $bar->progress->Set(0.5); + + // Each bar may also have optional left and right plot marks + // As illustration lets put a filled circle with a number at the end + // of each bar + $bar->rightMark->SetType(MARK_FILLEDCIRCLE); + $bar->rightMark->SetFillColor("red"); + $bar->rightMark->SetColor("red"); + $bar->rightMark->SetWidth(10); + + // Title for the mark + $bar->rightMark->title->Set("".($i+1)); + $bar->rightMark->title->SetColor("white"); + $bar->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,10); + $bar->rightMark->Show(); + + // ... and add the bar to the gantt chart + $graph->Add($bar); +} + +// Create a milestone mark +$ms = new MileStone(7,"M5","2001-12-10","10/12"); +$ms->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Add($ms); + +// Create a vertical line to emphasize the milestone +$vl = new GanttVLine("2001-12-10 13:00","Phase 1","darkred"); +$vl->SetDayOffset(0.5); // Center the line in the day +$graph->Add($vl); + +// Output the graph +$graph->Stroke(); + +// EOF +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex_slice.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex_slice.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex_slice.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttex_slice.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,78 @@ +SetShadow(); +$graph->SetBox(); + +// Only show part of the Gantt +$graph->SetDateRange('2001-11-22','2002-1-24'); + +// Weeks start on Sunday +$graph->scale->SetWeekStart(0); + +$graph->title->Set("General conversion plan"); +$graph->subtitle->Set("(Slice between 2001-11-22 to 2002-01-24)"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,20); + +$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK); +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); +$graph->scale->week->SetFont(FF_FONT1); + + +$data = array( + array(0,"Group 1\tJohan", "2002-1-23","2002-01-28",FF_FONT1,FS_BOLD,8), + array(1," Label 2", "2001-10-26","2001-11-16"), + array(2," Label 3", "2001-11-30","2001-12-01"), + array(4,"Group 2", "2001-11-30","2001-12-22",FF_FONT1,FS_BOLD,8), + array(5," Label 4", "2001-11-30","2001-12-1"), + array(6," Label 5", "2001-12-6","2001-12-8"), + array(8," Label 8", "2001-11-30","2002-01-02") + ); + + +// make up some fictionary activity bars +for($i=0; $i4 ) + $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]); + + $bar->rightMark->Show(); + $bar->rightMark->SetType(MARK_FILLEDCIRCLE); + $bar->rightMark->SetWidth(8); + $bar->rightMark->SetColor("red"); + $bar->rightMark->SetFillColor("red"); + $bar->rightMark->title->Set($i+1); + $bar->rightMark->title->SetFont(FF_ARIAL,FS_BOLD,12); + $bar->rightMark->title->SetColor("white"); + + $bar->SetPattern(BAND_RDIAG,"yellow"); + $bar->SetFillColor("red"); + $bar->progress->Set($i/10); + $bar->progress->SetPattern(GANTT_SOLID,"darkgreen"); + + $graph->Add($bar); +} + + +// The line will NOT be shown since it is outside the specified slice +$vline = new GanttVLine("2002-02-28"); +$vline->title->Set("2002-02-28"); +$vline->title->SetFont(FF_FONT1,FS_BOLD,10); +$graph->Add($vline); + +// The milestone will NOT be shown since it is outside the specified slice +$ms = new MileStone(7,"M5","2002-01-28","28/1"); +$ms->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Add($ms); + +$graph->Stroke(); + + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantthgridex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantthgridex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantthgridex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantthgridex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,63 @@ +title->Set("Grid example"); +$graph->subtitle->Set("(Horizontal grid)"); +$graph->title->SetFont(FF_VERDANA,FS_NORMAL,14); + +// Specify what headers to show +$graph->ShowHeaders(GANTT_HMONTH|GANTT_HDAY ); +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); +$graph->scale->week->SetFont(FF_FONT0); + +// Setup a horizontal grid +$graph->hgrid->Show(); +$graph->hgrid->SetRowFillColor('darkblue@0.9'); + + +for($i=0; $i 4 ) + $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]); + $bar->SetPattern(BAND_RDIAG,"yellow"); + $bar->SetFillColor("red"); + $graph->Add($bar); +} + +// Setup a vertical marker line +$vline = new GanttVLine("2001-11-01"); +$vline->SetDayOffset(0.5); +$vline->title->Set("2001-11-01"); +$vline->title->SetFont(FF_FONT1,FS_BOLD,10); +$graph->Add($vline); + +// Setup a milestone +$ms = new MileStone(6,"M5","2001-11-28","28/12"); +$ms->title->SetFont(FF_FONT1,FS_BOLD); +$graph->Add($ms); + +// And to show that you can also add an icon we add "Tux" +$icon = new IconPlot('penguin.png',0.05,0.95,1,15); +$icon->SetAnchor('left','bottom'); +$graph->Add($icon); + +// .. and finally send it back to the browser +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantthourex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantthourex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantthourex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantthourex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +SetMarginColor('blue:1.7'); +$graph->SetColor('white'); + +$graph->SetBackgroundGradient('navy','white',GRAD_HOR,BGRAD_MARGIN); +$graph->scale->hour->SetBackgroundColor('lightyellow:1.5'); +$graph->scale->hour->SetFont(FF_FONT1); +$graph->scale->day->SetBackgroundColor('lightyellow:1.5'); +$graph->scale->day->SetFont(FF_FONT1,FS_BOLD); + +$graph->title->Set("Example of hours in scale"); +$graph->title->SetColor('white'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); + +$graph->ShowHeaders(GANTT_HDAY | GANTT_HHOUR); + +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); +$graph->scale->week->SetFont(FF_FONT1); +$graph->scale->hour->SetIntervall(4); + +$graph->scale->hour->SetStyle(HOURSTYLE_HM24); +$graph->scale->day->SetStyle(DAYSTYLE_SHORTDAYDATE3); + +$data = array( + array(0," Label 1", "2001-01-26 04:00","2001-01-26 14:00"), + array(1," Label 2", "2001-01-26 10:00","2001-01-26 18:00"), + array(2," Label 3", "2001-01-26","2001-01-27 10:00") +); + + +for($i=0; $i4 ) + $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]); + $bar->SetPattern(BAND_RDIAG,"yellow"); + $bar->SetFillColor("red"); + $graph->Add($bar); +} + +$graph->Stroke(); + + + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantthourminex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantthourminex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantthourminex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantthourminex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,93 @@ +SetMarginColor('darkgreen@0.8'); +$graph->SetColor('white'); + +// We want to display day, hour and minute scales +$graph->ShowHeaders(GANTT_HDAY | GANTT_HHOUR | GANTT_HMIN); + +// We want to have the following titles in our columns +// describing each activity +$graph->scale->actinfo->SetColTitles( + array('Act','Duration','Start','Finish','Resp'));//,array(100,70,70,70)); + +// Uncomment the following line if you don't want the 3D look +// in the columns headers +//$graph->scale->actinfo->SetStyle(ACTINFO_2D); + +$graph->scale->actinfo->SetFont(FF_ARIAL,FS_NORMAL,10); + +//These are the default values for use in the columns +//$graph->scale->actinfo->SetFontColor('black'); +//$graph->scale->actinfo->SetBackgroundColor('lightgray'); +//$graph->scale->actinfo->vgrid->SetStyle('solid'); + +$graph->scale->actinfo->vgrid->SetColor('gray'); +$graph->scale->actinfo->SetColor('darkgray'); + +// Setup day format +$graph->scale->day->SetBackgroundColor('lightyellow:1.5'); +$graph->scale->day->SetFont(FF_ARIAL); +$graph->scale->day->SetStyle(DAYSTYLE_SHORTDAYDATE1); + +// Setup hour format +$graph->scale->hour->SetIntervall(1); +$graph->scale->hour->SetBackgroundColor('lightyellow:1.5'); +$graph->scale->hour->SetFont(FF_FONT0); +$graph->scale->hour->SetStyle(HOURSTYLE_H24); +$graph->scale->hour->grid->SetColor('gray:0.8'); + +// Setup minute format +$graph->scale->minute->SetIntervall(30); +$graph->scale->minute->SetBackgroundColor('lightyellow:1.5'); +$graph->scale->minute->SetFont(FF_FONT0); +$graph->scale->minute->SetStyle(MINUTESTYLE_MM); +$graph->scale->minute->grid->SetColor('lightgray'); + +$graph->scale->tableTitle->Set('Phase 1'); +$graph->scale->tableTitle->SetFont(FF_ARIAL,FS_NORMAL,12); +$graph->scale->SetTableTitleBackground('darkgreen@0.6'); +$graph->scale->tableTitle->Show(true); + +$graph->title->Set("Example of hours & mins scale"); +$graph->title->SetColor('darkgray'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); + + +for($i=0; $i4 ) + $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]); + $bar->SetPattern(BAND_RDIAG,"yellow"); + $bar->SetFillColor("gray"); + $graph->Add($bar); +} + + +//$vline = new GanttVLine("2001-11-27");//d=1006858800, +$vline = new GanttVLine("2001-11-27 9:00");//d=1006858800, +$vline->SetWeight(5); +$vline->SetDayOffset(0); +$vline->title->Set("27/11 9:00"); +$vline->title->SetFont(FF_FONT1,FS_BOLD,10); +$graph->Add($vline); + +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantticonex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantticonex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantticonex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantticonex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,77 @@ +title->Set("Gantt chart with title columns and icons"); +$graph->title->SetFont(FF_ARIAL, FS_BOLD,12); +$graph->title->SetMargin(10); + +// Explicitely set the date range +// (Autoscaling will of course also work) +$graph->SetDateRange('2001-10-06','2002-4-10'); + +// 1.5 line spacing to make more room +$graph->SetVMarginFactor(1.5); + +// Setup some nonstandard colors +$graph->SetMarginColor('darkgreen@0.95'); +$graph->SetBox(true,'yellow:0.6',2); +$graph->SetFrame(true,'darkgreen',4); +$graph->scale->divider->SetColor('yellow:0.6'); +$graph->scale->dividerh->SetColor('yellow:0.6'); + +// Display month and year scale with the gridlines +$graph->ShowHeaders(GANTT_HMONTH | GANTT_HYEAR); +$graph->scale->month->grid->SetColor('gray'); +$graph->scale->month->grid->Show(true); +$graph->scale->year->grid->SetColor('gray'); +$graph->scale->year->grid->Show(true); + +// For the titles we also add a minimum width of 100 pixels for the Task name column +$graph->scale->actinfo->SetColTitles( + array('Note','Task','Duration','Start','Finish'),array(30,100)); +$graph->scale->actinfo->SetBackgroundColor('green:0.5@0.5'); +$graph->scale->actinfo->SetFont(FF_ARIAL,FS_NORMAL,10); +$graph->scale->actinfo->vgrid->SetStyle('solid'); +$graph->scale->actinfo->vgrid->SetColor('gray'); + +// Uncomment this to keep the columns but show no headers +//$graph->scale->actinfo->Show(false); + +// Setup the icons we want to use +$erricon = new IconImage(GICON_FOLDER,0.6); +$startconicon = new IconImage(GICON_FOLDEROPEN,0.6); +$endconicon = new IconImage(GICON_TEXTIMPORTANT,0.5); + +// Store the icons in the first column and use plain text in the others +$data = array( + array(0,array($erricon,"Pre-study","102 days","23 Nov '01","1 Mar '02") + , "2001-11-23","2002-03-1",FF_ARIAL,FS_NORMAL,8), + array(1,array($startconicon,"Prototype","21 days","26 Oct '01","16 Nov '01"), + "2001-10-26","2001-11-16",FF_ARIAL,FS_NORMAL,8), + array(2,array($endconicon,"Report","12 days","1 Mar '02","13 Mar '02"), + "2002-03-01","2002-03-13",FF_ARIAL,FS_NORMAL,8) +); + +// Create the bars and add them to the gantt chart +for($i=0; $i4 ) + $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]); + $bar->SetPattern(BAND_RDIAG,"yellow"); + $bar->SetFillColor("gray"); + $bar->progress->Set(0.5); + $bar->progress->SetPattern(GANTT_SOLID,"darkgreen"); + $bar->title->SetCSIMTarget(array('#1'.$i,'#2'.$i,'#3'.$i,'#4'.$i,'#5'.$i),array('11'.$i,'22'.$i,'33'.$i)); + $graph->Add($bar); +} + +// Output the chart +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +title->Set("Only month & year scale"); + +// Setup some "very" nonstandard colors +$graph->SetMarginColor('lightgreen@0.8'); +$graph->SetBox(true,'yellow:0.6',2); +$graph->SetFrame(true,'darkgreen',4); +$graph->scale->divider->SetColor('yellow:0.6'); +$graph->scale->dividerh->SetColor('yellow:0.6'); + +// Explicitely set the date range +// (Autoscaling will of course also work) +$graph->SetDateRange('2001-10-06','2002-4-01'); + +// Display month and year scale with the gridlines +$graph->ShowHeaders(GANTT_HMONTH | GANTT_HYEAR); +$graph->scale->month->grid->SetColor('gray'); +$graph->scale->month->grid->Show(true); +$graph->scale->year->grid->SetColor('gray'); +$graph->scale->year->grid->Show(true); + +// Data for our example activities +$data = array( + array(0,"Group 1 Johan", "2001-11-23","2002-03-1",FF_FONT1,FS_BOLD,8), + array(1," Label 2", "2001-10-26","2001-11-16")); + +// Create the bars and add them to the gantt chart +for($i=0; $i4 ) + $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]); + $bar->SetPattern(BAND_RDIAG,"yellow"); + $bar->SetFillColor("red"); + $bar->progress->Set(0.5); + $bar->progress->SetPattern(GANTT_SOLID,"darkgreen"); + $graph->Add($bar); +} + +// Output the chart +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,66 @@ +title->Set("Only month & year scale"); + +// Setup some "very" nonstandard colors +$graph->SetMarginColor('lightgreen@0.8'); +$graph->SetBox(true,'yellow:0.6',2); +$graph->SetFrame(true,'darkgreen',4); +$graph->scale->divider->SetColor('yellow:0.6'); +$graph->scale->dividerh->SetColor('yellow:0.6'); + +// Explicitely set the date range +// (Autoscaling will of course also work) +$graph->SetDateRange('2001-10-06','2002-4-10'); + +// Display month and year scale with the gridlines +$graph->ShowHeaders(GANTT_HMONTH | GANTT_HYEAR); +$graph->scale->month->grid->SetColor('gray'); +$graph->scale->month->grid->Show(true); +$graph->scale->year->grid->SetColor('gray'); +$graph->scale->year->grid->Show(true); + + +// Setup activity info + +// For the titles we also add a minimum width of 100 pixels for the Task name column +$graph->scale->actinfo->SetColTitles( + array('Name','Duration','Start','Finish'),array(100)); +$graph->scale->actinfo->SetBackgroundColor('green:0.5@0.5'); +$graph->scale->actinfo->SetFont(FF_ARIAL,FS_NORMAL,10); +$graph->scale->actinfo->vgrid->SetStyle('solid'); +$graph->scale->actinfo->vgrid->SetColor('gray'); + +// Data for our example activities +$data = array( + array(0,array("Pre-study","102 days","23 Nov '01","1 Mar '02") + , "2001-11-23","2002-03-1",FF_ARIAL,FS_NORMAL,8), + array(1,array("Prototype","21 days","26 Oct '01","16 Nov '01"), + "2001-10-26","2001-11-16",FF_ARIAL,FS_NORMAL,8), + array(2,array("Report","12 days","1 Mar '02","13 Mar '02"), + "2002-03-01","2002-03-13",FF_ARIAL,FS_NORMAL,8) +); + +// Create the bars and add them to the gantt chart +for($i=0; $i4 ) + $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]); + $bar->SetPattern(BAND_RDIAG,"yellow"); + $bar->SetFillColor("gray"); + $bar->progress->Set(0.5); + $bar->progress->SetPattern(GANTT_SOLID,"darkgreen"); + $graph->Add($bar); +} + +// Output the chart +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,66 @@ +title->Set("Only month & year scale"); + +// Setup some "very" nonstandard colors +$graph->SetMarginColor('lightgreen@0.8'); +$graph->SetBox(true,'yellow:0.6',2); +$graph->SetFrame(true,'darkgreen',4); +$graph->scale->divider->SetColor('yellow:0.6'); +$graph->scale->dividerh->SetColor('yellow:0.6'); + +// Explicitely set the date range +// (Autoscaling will of course also work) +$graph->SetDateRange('2001-10-06','2002-4-10'); + +// Display month and year scale with the gridlines +$graph->ShowHeaders(GANTT_HMONTH | GANTT_HYEAR); +$graph->scale->month->grid->SetColor('gray'); +$graph->scale->month->grid->Show(true); +$graph->scale->year->grid->SetColor('gray'); +$graph->scale->year->grid->Show(true); + + +// Setup activity info + +// For the titles we also add a minimum width of 100 pixels for the Task name column +$graph->scale->actinfo->SetColTitles( + array('Type','Name','Duration','Start','Finish'),array(40,100)); +$graph->scale->actinfo->SetBackgroundColor('green:0.5@0.5'); +$graph->scale->actinfo->SetFont(FF_ARIAL,FS_NORMAL,10); +$graph->scale->actinfo->vgrid->SetStyle('solid'); +$graph->scale->actinfo->vgrid->SetColor('gray'); + +// Data for our example activities +$data = array( + array(0,array("","Pre-study","102 days","23 Nov '01","1 Mar '02") + , "2001-11-23","2002-03-1",FF_ARIAL,FS_NORMAL,8), + array(1,array("","Prototype","21 days","26 Oct '01","16 Nov '01"), + "2001-10-26","2001-11-16",FF_ARIAL,FS_NORMAL,8), + array(2,array("","Report","12 days","1 Mar '02","13 Mar '02"), + "2002-03-01","2002-03-13",FF_ARIAL,FS_NORMAL,8) +); + +// Create the bars and add them to the gantt chart +for($i=0; $i4 ) + $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]); + $bar->SetPattern(BAND_RDIAG,"yellow"); + $bar->SetFillColor("gray"); + $bar->progress->Set(0.5); + $bar->progress->SetPattern(GANTT_SOLID,"darkgreen"); + $graph->Add($bar); +} + +// Output the chart +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttmonthyearex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,71 @@ +title->Set("Adding a spaning title"); + +// Setup some "very" nonstandard colors +$graph->SetMarginColor('lightgreen@0.8'); +$graph->SetBox(true,'yellow:0.6',2); +$graph->SetFrame(true,'darkgreen',4); +$graph->scale->divider->SetColor('yellow:0.6'); +$graph->scale->dividerh->SetColor('yellow:0.6'); + +// Explicitely set the date range +// (Autoscaling will of course also work) +$graph->SetDateRange('2001-11-06','2002-1-10'); + +// Display month and year scale with the gridlines +$graph->ShowHeaders(GANTT_HMONTH | GANTT_HYEAR | GANTT_HWEEK ); +$graph->scale->month->grid->SetColor('gray'); +$graph->scale->month->grid->Show(true); +$graph->scale->year->grid->SetColor('gray'); +$graph->scale->year->grid->Show(true); + + +//Setup spanning title +$graph->scale->tableTitle->Set( 'Phase 1' ); +$graph->scale->tableTitle->SetFont( FF_ARIAL , FS_NORMAL , 16 ); +$graph->scale->SetTableTitleBackground( 'darkgreen@0.6' ); +$graph->scale->tableTitle->Show( true ); + +// Setup activity info + +// For the titles we also add a minimum width of 100 pixels for the Task name column +$graph->scale->actinfo->SetColTitles(array('Name','Duration','Start','Finish'),array(100)); +$graph->scale->actinfo->SetBackgroundColor('green:0.5@0.5'); +$graph->scale->actinfo->SetFont(FF_ARIAL,FS_NORMAL,10); +$graph->scale->actinfo->vgrid->SetStyle('solid'); +$graph->scale->actinfo->vgrid->SetColor('gray'); + +// Data for our example activities +$data = array( + array(0,array("Pre-study","102 days","23 Nov '01","1 Mar '02") + , "2001-11-23","2002-03-1",FF_ARIAL,FS_NORMAL,8), + array(1,array("Prototype","21 days","26 Oct '01","16 Nov '01"), + "2001-10-26","2001-11-16",FF_ARIAL,FS_NORMAL,8), + array(2,array("Report","12 days","1 Mar '02","13 Mar '02"), + "2002-03-01","2002-03-13",FF_ARIAL,FS_NORMAL,8) +); + +// Create the bars and add them to the gantt chart +for($i=0; $i4 ) + $bar->title->SetFont($data[$i][4],$data[$i][5],$data[$i][6]); + $bar->SetPattern(BAND_RDIAG,"yellow"); + $bar->SetFillColor("gray"); + $bar->progress->Set(0.5); + $bar->progress->SetPattern(GANTT_SOLID,"darkgreen"); + $graph->Add($bar); +} + +// Output the chart +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_samerowex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_samerowex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_samerowex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_samerowex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,63 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("Activities on same row"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1); // 1=default value + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity1 = new GanttBar(0,"Activity 1","2001-12-21","2001-12-26",""); + +// Yellow diagonal line pattern on a red background +$activity1->SetPattern(BAND_RDIAG,"yellow"); +$activity1->SetFillColor("red"); + +// Set absolute height of activity +$activity1->SetHeight(16); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(0,"","2001-12-31","2002-01-2","[BO]"); + +// ADjust font for caption +$activity2->caption->SetFont(FF_ARIAL,FS_BOLD); +$activity2->caption->SetColor("darkred"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Set absolute height of activity +$activity2->SetHeight(16); + +// Finally add the bar to the graph +$graph->Add($activity1); +$graph->Add($activity2); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_samerowex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_samerowex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_samerowex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_samerowex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,65 @@ +SetShadow(); + +// Add title and subtitle +$graph->title->Set("Activities on same row"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->subtitle->Set('Using break style'); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Instead of week number show the date for the first day in the week +// on the week scale +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Make the week scale font smaller than the default +$graph->scale->week->SetFont(FF_FONT0); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR4); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1); // 1=default value + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity1 = new GanttBar(0,"Activity 1","2001-12-21","2001-12-26",""); + +// Yellow diagonal line pattern on a red background +$activity1->SetPattern(BAND_RDIAG,"yellow"); +$activity1->SetFillColor("red"); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$break1 = new GanttBar(0,'',"2001-12-27","2001-12-30",""); +$break1->SetBreakStyle(true,'dotted',2); +$break1->SetColor('red'); +$graph->Add($break1); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(0,"","2001-12-31","2002-01-2","[BO]"); + +// ADjust font for caption +$activity2->caption->SetFont(FF_ARIAL,FS_BOLD); +$activity2->caption->SetColor("darkred"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Finally add the bar to the graph +$graph->Add($activity1); +$graph->Add($activity2); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttsimpleex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttsimpleex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ganttsimpleex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ganttsimpleex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,31 @@ +title->Set("Gantt Graph using CreateSimple()"); + +// Setup scale +$graph->ShowHeaders(GANTT_HYEAR | GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK); +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + +// Add the specified activities +$graph->CreateSimple($data); + +// .. and stroke the graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_textex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_textex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_textex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gantt_textex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,96 @@ +SetBox(); +$graph->SetShadow(); + +// Add title and subtitle +$graph->title->Set("Example with added texts"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// Show day, week and month scale +$graph->ShowHeaders(GANTT_HDAY | GANTT_HWEEK | GANTT_HMONTH); + +// Set table title +$graph->scale->tableTitle->Set("(Rev: 1.22)"); +$graph->scale->tableTitle->SetFont(FF_FONT1,FS_BOLD); +$graph->scale->SetTableTitleBackground("silver"); + +// Modify the appearance of the dividing lines +$graph->scale->divider->SetWeight(3); +$graph->scale->divider->SetColor("navy"); +$graph->scale->dividerh->SetWeight(3); +$graph->scale->dividerh->SetColor("navy"); + +// Use the short name of the month together with a 2 digit year +// on the month scale +$graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAMEYEAR2); +$graph->scale->month->SetFontColor("white"); +$graph->scale->month->SetBackgroundColor("blue"); + +// 0 % vertical label margin +$graph->SetLabelVMarginFactor(1); + +// Format the bar for the first activity +// ($row,$title,$startdate,$enddate) +$activity = new GanttBar(0,"Project","2001-12-21","2002-01-07","[50%]"); + +// Yellow diagonal line pattern on a red background +$activity->SetPattern(BAND_RDIAG,"yellow"); +$activity->SetFillColor("red"); + +// Set absolute height +$activity->SetHeight(10); + +// Specify progress to 60% +$activity->progress->Set(0.6); +$activity->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Format the bar for the second activity +// ($row,$title,$startdate,$enddate) +$activity2 = new GanttBar(1,"Project","2001-12-21","2001-12-27","[30%]"); + +// Yellow diagonal line pattern on a red background +$activity2->SetPattern(BAND_RDIAG,"yellow"); +$activity2->SetFillColor("red"); + +// Set absolute height +$activity2->SetHeight(10); + +// Specify progress to 30% +$activity2->progress->Set(0.3); +$activity2->progress->SetPattern(BAND_HVCROSS,"blue"); + +// Finally add the bar to the graph +$graph->Add($activity); +$graph->Add($activity2); + +// Add text to top left corner of graph +$txt1 = new Text(); +$txt1->SetPos(5,2); +$txt1->Set("Note:\nEstimate done w148"); +$txt1->SetFont(FF_ARIAL,FS_BOLD,12); +$txt1->SetColor('darkred'); +$graph->Add($txt1); + +// Add text to the top bar +$txt2 = new Text(); +$txt2->SetScalePos("2002-01-01",1); +$txt2->SetFont(FF_ARIAL,FS_BOLD,12); +$txt2->SetAlign('left','center'); +$txt2->Set("Remember this!"); +$txt2->SetBox('yellow'); +$graph->Add($txt2); + + +// Add a vertical line +$vline = new GanttVLine("2001-12-24","Phase 1"); +$vline->SetDayOffset(0.5); +//$graph->Add($vline); + +// ... and display it +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,59 @@ +clearTheme(); +$graph->img->SetMargin(40,30,40,50); +$graph->SetScale("textint"); +$graph->SetFrame(true,'blue',1); +$graph->SetColor('lightblue'); +$graph->SetMarginColor('lightblue'); + +// Setup X-axis labels +$a = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($a); +$graph->xaxis->SetFont(FF_FONT1); +$graph->xaxis->SetColor('darkblue','black'); + +// Setup "hidden" y-axis by given it the same color +// as the background (this could also be done by setting the weight +// to zero) +$graph->yaxis->SetColor('lightblue','darkblue'); +$graph->ygrid->SetColor('white'); + +// Setup graph title ands fonts +$graph->title->Set('Using grace = 0'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->xaxis->SetTitle('Year 2002','center'); +$graph->xaxis->SetTitleMargin(10); +$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); + +// Add some grace to the top so that the scale doesn't +// end exactly at the max value. +$graph->yaxis->scale->SetGrace(0); + + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor('darkblue'); +$bplot->SetColor('darkblue'); +$bplot->SetWidth(0.5); +$bplot->SetShadow('darkgray'); + +// Setup the values that are displayed on top of each bar +// Must use TTF fonts if we want text at an arbitrary angle +$bplot->value->Show(); +$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,8); +$bplot->value->SetFormat('$%d'); +$bplot->value->SetColor('darkred'); +$bplot->value->SetAngle(45); +$graph->Add($bplot); + +// Finally stroke the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,59 @@ +clearTheme(); +$graph->img->SetMargin(40,30,40,50); +$graph->SetScale("textint"); +$graph->SetFrame(true,'blue',1); +$graph->SetColor('lightblue'); +$graph->SetMarginColor('lightblue'); + +// Setup X-axis labels +$a = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($a); +$graph->xaxis->SetFont(FF_FONT1); +$graph->xaxis->SetColor('darkblue','black'); + +// Setup "hidden" y-axis by given it the same color +// as the background (this could also be done by setting the weight +// to zero) +$graph->yaxis->SetColor('lightblue','darkblue'); +$graph->ygrid->SetColor('white'); + +// Setup graph title ands fonts +$graph->title->Set('Using grace = 10%'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->xaxis->SetTitle('Year 2002','center'); +$graph->xaxis->SetTitleMargin(10); +$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); + +// Add some grace to the top so that the scale doesn't +// end exactly at the max value. +$graph->yaxis->scale->SetGrace(10); + + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor('darkblue'); +$bplot->SetColor('darkblue'); +$bplot->SetWidth(0.5); +$bplot->SetShadow('darkgray'); + +// Setup the values that are displayed on top of each bar +// Must use TTF fonts if we want text at an arbitrary angle +$bplot->value->Show(); +$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,8); +$bplot->value->SetFormat('$%d'); +$bplot->value->SetColor('darkred'); +$bplot->value->SetAngle(45); +$graph->Add($bplot); + +// Finally stroke the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,59 @@ +clearTheme(); +$graph->img->SetMargin(40,30,40,50); +$graph->SetScale("textint"); +$graph->SetFrame(true,'blue',1); +$graph->SetColor('lightblue'); +$graph->SetMarginColor('lightblue'); + +// Setup X-axis labels +$a = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($a); +$graph->xaxis->SetFont(FF_FONT1); +$graph->xaxis->SetColor('darkblue','black'); + +// Setup "hidden" y-axis by given it the same color +// as the background (this could also be done by setting the weight +// to zero) +$graph->yaxis->SetColor('lightblue','darkblue'); +$graph->ygrid->SetColor('white'); + +// Setup graph title ands fonts +$graph->title->Set('Using grace = 50%'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->xaxis->SetTitle('Year 2002','center'); +$graph->xaxis->SetTitleMargin(10); +$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); + +// Add some grace to the top so that the scale doesn't +// end exactly at the max value. +$graph->yaxis->scale->SetGrace(50); + + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor('darkblue'); +$bplot->SetColor('darkblue'); +$bplot->SetWidth(0.5); +$bplot->SetShadow('darkgray'); + +// Setup the values that are displayed on top of each bar +// Must use TTF fonts if we want text at an arbitrary angle +$bplot->value->Show(); +$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,8); +$bplot->value->SetFormat('$%d'); +$bplot->value->SetColor('darkred'); +$bplot->value->SetAngle(45); +$graph->Add($bplot); + +// Finally stroke the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/grace_ex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,59 @@ +clearTheme(); +$graph->img->SetMargin(40,30,40,50); +$graph->SetScale("textint"); +$graph->SetFrame(true,'blue',1); +$graph->SetColor('lightblue'); +$graph->SetMarginColor('lightblue'); + +// Setup X-axis labels +$a = $gDateLocale->GetShortMonth(); +$graph->xaxis->SetTickLabels($a); +$graph->xaxis->SetFont(FF_FONT1); +$graph->xaxis->SetColor('darkblue','black'); + +// Setup "hidden" y-axis by given it the same color +// as the background (this could also be done by setting the weight +// to zero) +$graph->yaxis->SetColor('lightblue','darkblue'); +$graph->ygrid->SetColor('white'); + +// Setup graph title ands fonts +$graph->title->Set('Using grace = 100%'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->xaxis->SetTitle('Year 2002','center'); +$graph->xaxis->SetTitleMargin(10); +$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); + +// Add some grace to the top so that the scale doesn't +// end exactly at the max value. +$graph->yaxis->scale->SetGrace(100); + + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor('darkblue'); +$bplot->SetColor('darkblue'); +$bplot->SetWidth(0.5); +$bplot->SetShadow('darkgray'); + +// Setup the values that are displayed on top of each bar +// Must use TTF fonts if we want text at an arbitrary angle +$bplot->value->Show(); +$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,8); +$bplot->value->SetFormat('$%d'); +$bplot->value->SetColor('darkred'); +$bplot->value->SetAngle(45); +$graph->Add($bplot); + +// Finally stroke the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gradbkgex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gradbkgex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gradbkgex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gradbkgex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,65 @@ +clearTheme(); +$graph->SetMarginColor('white'); +$graph->SetScale("textlin",0,50); +$graph->SetMargin(30,50,30,30); + +// We must have the frame enabled to get the gradient +// However, we don't want the frame line so we set it to +// white color which makes it invisible. +$graph->SetFrame(true,'white'); + +// Setup a background gradient image +$graph->SetBackgroundGradient('blue','navy:0.5',GRAD_HOR,BGRAD_PLOT); + +// Setup the tab title +$graph->tabtitle->Set(' 3rd Division ' ); +$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,13); + +// Setup x,Y grid +$graph->xgrid->Show(); +$graph->xgrid->SetColor('gray@0.5'); +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); +$graph->ygrid->SetColor('gray@0.5'); + +// Setup color for axis and labels on axis +$graph->xaxis->SetColor('orange','black'); +$graph->yaxis->SetColor('orange','black'); + +// Ticks on the outsid +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Setup the legend box colors and font +$graph->legend->SetColor('white','navy'); +$graph->legend->SetFillColor('navy@0.25'); +$graph->legend->SetFont(FF_ARIAL,FS_BOLD,8); +$graph->legend->SetShadow('darkgray@0.4',3); +$graph->legend->SetPos(0.05,0.05,'right','top'); + +// Create the first line +$p1 = new LinePlot($datay1); +$p1->SetColor("red"); +$p1->SetWeight(2); +$p1->SetLegend('2002'); +$graph->Add($p1); + +// Create the second line +$p2 = new LinePlot($datay2); +$p2->SetColor("lightyellow"); +$p2->SetLegend('2001'); +$p2->SetWeight(2); +$graph->Add($p2); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,28 @@ +clearTheme(); +$graph->SetMargin(40,40,20,30); +$graph->SetScale("intlin"); +$graph->SetMarginColor('darkgreen@0.8'); + +$graph->title->Set('Gradient filled line plot'); +$graph->yscale->SetAutoMin(0); + +// Create the line +$p1 = new LinePlot($datay); +$p1->SetColor("blue"); +$p1->SetWeight(0); +$p1->SetFillGradient('red','yellow'); + +$graph->Add($p1); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,29 @@ +clearTheme(); +$graph->SetMargin(40,40,20,30); +$graph->SetScale("intlin"); +$graph->SetBox(); +$graph->SetMarginColor('darkgreen@0.8'); + +// Setup a background gradient image +$graph->SetBackgroundGradient('darkred','yellow',GRAD_HOR,BGRAD_PLOT); + +$graph->title->Set('Gradient filled line plot ex2'); +$graph->yscale->SetAutoMin(0); + +// Create the line +$p1 = new LinePlot($datay); +$p1->SetFillGradient('white','darkgreen'); +$graph->Add($p1); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,29 @@ +clearTheme(); +$graph->SetMargin(40,40,20,30); +$graph->SetScale("intlin"); +$graph->SetBox(); +$graph->SetMarginColor('darkgreen@0.8'); + +// Setup a background gradient image +$graph->SetBackgroundGradient('darkred','yellow',GRAD_HOR,BGRAD_PLOT); + +$graph->title->Set('Gradient filled line plot ex3'); +$graph->yscale->SetAutoMin(0); + +// Create the line +$p1 = new LinePlot($datay); +$p1->SetFillGradient('white','darkgreen',4); +$graph->Add($p1); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/gradlinefillex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +clearTheme(); +$graph->SetMargin(40,40,20,30); +$graph->SetScale("intlin"); +$graph->SetBox(); +$graph->SetMarginColor('darkgreen@0.8'); + +// Setup a background gradient image +$graph->SetBackgroundGradient('darkred','yellow',GRAD_HOR,BGRAD_PLOT); + +$graph->title->Set('Gradient filled line plot ex2'); +$graph->yscale->SetAutoMin(0); + +// Create the line +$p1 = new LinePlot($datay); +$p1->SetFillGradient('white','darkgreen'); +$p1->SetStepStyle(); +$graph->Add($p1); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/green_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/green_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/green_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/green_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ + array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ), + 1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ), + 2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ), + 3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ), + 4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ), + 5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ), + 6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ), + 7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ), + 8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ), +); + + +// Create the graph. These two calls are always required +$graph = new Graph(400,300); + +$graph->SetScale("textlin"); +if ($theme) { + $graph->SetTheme(new $theme()); +} +$theme_class = new GreenTheme; +$graph->SetTheme($theme_class); + +$plot = array(); +// Create the bar plots +for ($i = 0; $i < 4; $i++) { + $plot[$i] = new BarPlot($data[$i]); + $plot[$i]->SetLegend('plot'.($i+1)); +} +//$acc1 = new AccBarPlot(array($plot[0], $plot[1])); +//$acc1->value->Show(); +$gbplot = new GroupBarPlot(array($plot[2], $plot[1] )); + +for ($i = 4; $i < 8; $i++) { + $plot[$i] = new LinePlot($data[$i]); + $plot[$i]->SetLegend('plot'.$i); + $plot[$i]->value->Show(); +} + +$graph->Add($gbplot); +$graph->Add($plot[4]); + +$title = "GreenTheme Example"; +$title = mb_convert_encoding($title,'UTF-8'); +$graph->title->Set($title); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/groupbarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/groupbarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/groupbarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/groupbarex1.php 2020-05-26 06:19:52.000000000 +0100 @@ -0,0 +1,44 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->img->SetMargin(40,30,40,40); +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +$graph->xaxis->title->Set('Year 2002'); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$graph->title->Set('Group bar plot'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$bplot1 = new BarPlot($datay1); +$bplot2 = new BarPlot($datay2); +$bplot3 = new BarPlot($datay3); + +$bplot1->SetFillColor("orange"); +$bplot2->SetFillColor("brown"); +$bplot3->SetFillColor("darkgreen"); + +$bplot1->SetShadow(); +$bplot2->SetShadow(); +$bplot3->SetShadow(); + +$bplot1->SetShadow(); +$bplot2->SetShadow(); +$bplot3->SetShadow(); + +$gbarplot = new GroupBarPlot(array($bplot1,$bplot2,$bplot3)); +$gbarplot->SetWidth(0.6); +$graph->Add($gbarplot); + +$graph->Stroke(); +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/__handle and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/__handle differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/heat1.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/heat1.jpg differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,64 @@ +clearTheme(); +$graph->SetScale('textlin'); + +// Rotate graph 90 degrees and set margin +$graph->Set90AndMargin(50,20,50,30); + +// Nice shadow +$graph->SetShadow(); + +// Setup title +$graph->title->Set('Horizontal bar graph ex 1'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); + +// Setup X-axis +$graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,12); + +// Some extra margin looks nicer +$graph->xaxis->SetLabelMargin(10); + +// Label align for X-axis +$graph->xaxis->SetLabelAlign('right','center'); + +// Add some grace to y-axis so the bars doesn't go +// all the way to the end of the plot area +$graph->yaxis->scale->SetGrace(20); + +// We don't want to display Y-axis +$graph->yaxis->Hide(); + +// Now create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor('orange'); +$bplot->SetShadow(); + +//You can change the width of the bars if you like +//$bplot->SetWidth(0.5); + +// We want to display the value of each bar at the top +$bplot->value->Show(); +$bplot->value->SetFont(FF_ARIAL,FS_BOLD,12); +$bplot->value->SetAlign('left','center'); +$bplot->value->SetColor('black','darkred'); +$bplot->value->SetFormat('%.1f mkr'); + +// Add the bar to the graph +$graph->Add($bplot); + +// .. and stroke the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,71 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$top = 80; +$bottom = 30; +$left = 50; +$right = 30; +$graph->Set90AndMargin($left,$right,$top,$bottom); + +// Nice shadow +$graph->SetShadow(); + +// Setup title +$graph->title->Set("Horizontal bar graph ex 2"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); +$graph->subtitle->Set("(Axis at top)"); + +// Setup X-axis +$graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,12); + +// Some extra margin looks nicer +$graph->xaxis->SetLabelMargin(5); + +// Label align for X-axis +$graph->xaxis->SetLabelAlign('right','center'); + +// Add some grace to y-axis so the bars doesn't go +// all the way to the end of the plot area +$graph->yaxis->scale->SetGrace(20); +$graph->yaxis->SetLabelAlign('center','bottom'); +$graph->yaxis->SetLabelAngle(45); +$graph->yaxis->SetLabelFormat('%d'); +$graph->yaxis->SetFont(FF_VERDANA,FS_NORMAL,12); + +// We don't want to display Y-axis +//$graph->yaxis->Hide(); + +// Now create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); +$bplot->SetShadow(); + +//You can change the width of the bars if you like +//$bplot->SetWidth(0.5); + +// We want to display the value of each bar at the top +$bplot->value->Show(); +$bplot->value->SetFont(FF_ARIAL,FS_BOLD,12); +$bplot->value->SetAlign('left','center'); +$bplot->value->SetColor("black","darkred"); +$bplot->value->SetFormat('%.1f mkr'); + +// Add the bar to the graph +$graph->Add($bplot); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,100 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$top = 50; +$bottom = 80; +$left = 50; +$right = 20; +$graph->Set90AndMargin($left,$right,$top,$bottom); + +$graph->xaxis->SetPos('min'); + +// Nice shadow +$graph->SetShadow(); + +// Setup title +$graph->title->Set("Horizontal bar graph ex 3"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); +$graph->subtitle->Set("(Axis at bottom)"); + +// Setup X-axis +$graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetFont(FF_FONT2,FS_BOLD,12); + +// Some extra margin looks nicer +$graph->xaxis->SetLabelMargin(5); + +// Label align for X-axis +$graph->xaxis->SetLabelAlign('right','center'); + +// Add some grace to y-axis so the bars doesn't go +// all the way to the end of the plot area +$graph->yaxis->scale->SetGrace(20); + +// Setup the Y-axis to be displayed in the bottom of the +// graph. We also finetune the exact layout of the title, +// ticks and labels to make them look nice. +$graph->yaxis->SetPos('max'); + +// First make the labels look right +$graph->yaxis->SetLabelAlign('center','top'); +$graph->yaxis->SetLabelFormat('%d'); +$graph->yaxis->SetLabelSide(SIDE_RIGHT); + +// The fix the tick marks +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Finally setup the title +$graph->yaxis->SetTitleSide(SIDE_RIGHT); +$graph->yaxis->SetTitleMargin(35); + +// To align the title to the right use : +$graph->yaxis->SetTitle('Turnaround 2002','high'); +$graph->yaxis->title->Align('right'); + +// To center the title use : +//$graph->yaxis->SetTitle('Turnaround 2002','center'); +//$graph->yaxis->title->Align('center'); + +$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->yaxis->title->SetAngle(0); + +$graph->yaxis->SetFont(FF_FONT2,FS_NORMAL); +// If you want the labels at an angle other than 0 or 90 +// you need to use TTF fonts +//$graph->yaxis->SetLabelAngle(0); + +// Now create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); +$bplot->SetShadow(); + +//You can change the width of the bars if you like +//$bplot->SetWidth(0.5); + +// We want to display the value of each bar at the top +$bplot->value->Show(); +$bplot->value->SetFont(FF_ARIAL,FS_BOLD,12); +$bplot->value->SetAlign('left','center'); +$bplot->value->SetColor("black","darkred"); +$bplot->value->SetFormat('%.1f mkr'); + +// Add the bar to the graph +$graph->Add($bplot); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +clearTheme(); +$graph->SetScale('textlin'); + +$top = 60; +$bottom = 30; +$left = 80; +$right = 30; +$graph->Set90AndMargin($left,$right,$top,$bottom); + +// Nice shadow +$graph->SetShadow(); + +// Setup labels +$lbl = array("Andrew\nTait","Thomas\nAnderssen","Kevin\nSpacey","Nick\nDavidsson", +"David\nLindquist","Jason\nTait","Lorin\nPersson"); +$graph->xaxis->SetTickLabels($lbl); + +// Label align for X-axis +$graph->xaxis->SetLabelAlign('right','center','right'); + +// Label align for Y-axis +$graph->yaxis->SetLabelAlign('center','bottom'); + +// Titles +$graph->title->Set('Number of incidents'); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor('orange'); +$bplot->SetWidth(0.5); +$bplot->SetYMin(1990); + +$graph->Add($bplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/horizbarex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,84 @@ +clearTheme(); +$graph->SetScale("textlin"); + +// No frame around the image +$graph->SetFrame(false); + +// Rotate graph 90 degrees and set margin +$graph->Set90AndMargin(100,20,50,30); + +// Set white margin color +$graph->SetMarginColor('white'); + +// Use a box around the plot area +$graph->SetBox(); + +// Use a gradient to fill the plot area +$graph->SetBackgroundGradient('white','lightblue',GRAD_HOR,BGRAD_PLOT); + +// Setup title +$graph->title->Set("Graphic card performance"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,11); +$graph->subtitle->Set("(Non optimized)"); + +// Setup X-axis +$graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetFont(FF_VERDANA,FS_NORMAL,8); + +// Some extra margin looks nicer +$graph->xaxis->SetLabelMargin(10); + +// Label align for X-axis +$graph->xaxis->SetLabelAlign('right','center'); + +// Add some grace to y-axis so the bars doesn't go +// all the way to the end of the plot area +$graph->yaxis->scale->SetGrace(20); + +// We don't want to display Y-axis +$graph->yaxis->Hide(); + +// Now create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetShadow(); + +//You can change the width of the bars if you like +//$bplot->SetWidth(0.5); + +// Set gradient fill for bars +$bplot->SetFillGradient('darkred','yellow',GRAD_HOR); + +// We want to display the value of each bar at the top +$bplot->value->Show(); +$bplot->value->SetFont(FF_ARIAL,FS_BOLD,10); +//$bplot->value->SetAlign('left','center'); +$bplot->value->SetColor("white"); +$bplot->value->SetFormat('%.1f'); +$bplot->SetValuePos('max'); + +// Add the bar to the graph +$graph->Add($bplot); + +// Add some explanation text +$txt = new Text('Note: Higher value is better.'); +$txt->SetPos(190,399,'center','bottom'); +$txt->SetFont(FF_ARIAL,FS_NORMAL,8); +$graph->Add($txt); + +// .. and stroke the graph +$graph->Stroke(); +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/icon.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/icon.jpg differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/imgmarkercsimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/imgmarkercsimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/imgmarkercsimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/imgmarkercsimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,55 @@ +SetMarginColor('white'); +$graph->SetScale("textlin"); +$graph->SetFrame(false); +$graph->SetMargin(30,5,25,20); + +// Setup the tab +$graph->tabtitle->Set(' Year 2003 ' ); +$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,13); +$graph->tabtitle->SetColor('darkred','#E1E1FF'); + +// Enable X-grid as well +$graph->xgrid->Show(); + +// Use months as X-labels +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +// Create the plot +$p1 = new LinePlot($datay1); +$p1->SetColor("navy"); + +$p1->SetCSIMTargets(array('#1','#2','#3','#4','#5')); + +// Use an image of favourite car as +$p1->mark->SetType(MARK_IMG,'saab_95.jpg',0.5); +//$p1->mark->SetType(MARK_SQUARE); + +// Displayes value on top of marker image +$p1->value->SetFormat('%d mil'); +$p1->value->Show(); +$p1->value->SetColor('darkred'); +$p1->value->SetFont(FF_ARIAL,FS_BOLD,10); +// Increase the margin so that the value is printed avove tje +// img marker +$p1->value->SetMargin(14); + +// Incent the X-scale so the first and last point doesn't +// fall on the edges +$p1->SetCenter(); + +$graph->Add($p1); + +$graph->StrokeCSIM(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/imgmarkerex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/imgmarkerex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/imgmarkerex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/imgmarkerex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +clearTheme(); +$graph->SetMarginColor('white'); +$graph->SetScale("textlin"); +$graph->SetFrame(false); +$graph->SetMargin(30,5,25,20); + +// Setup the tab +$graph->tabtitle->Set(' Year 2003 ' ); +$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,13); +$graph->tabtitle->SetColor('darkred','#E1E1FF'); + +// Enable X-grid as well +$graph->xgrid->Show(); + +// Use months as X-labels +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +// Create the plot +$p1 = new LinePlot($datay1); +$p1->SetColor("navy"); + +// Use an image of favourite car as marker +$p1->mark->SetType(MARK_IMG,'saab_95.jpg',0.5); + +// Displayes value on top of marker image +$p1->value->SetFormat('%d mil'); +$p1->value->Show(); +$p1->value->SetColor('darkred'); +$p1->value->SetFont(FF_ARIAL,FS_BOLD,10); +// Increase the margin so that the value is printed avove tje +// img marker +$p1->value->SetMargin(14); + +// Incent the X-scale so the first and last point doesn't +// fall on the edges +$p1->SetCenter(); + +$graph->Add($p1); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +SetScale("textlin"); + +$graph->SetShadow(); +$graph->img->SetMargin(40,40,40,40); + +$graph->title->Set("Simple mpuls plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$sp1 = new ScatterPlot($datay); +$sp1->mark->SetType(MARK_SQUARE); +$sp1->SetImpuls(); + +$graph->Add($sp1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +clearTheme(); +$graph->SetScale("textlin"); + +$graph->SetShadow(); +$graph->img->SetMargin(40,40,40,40); + +$graph->title->Set("Impuls plot, variant 2"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->Set("Impuls respons"); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$sp1 = new ScatterPlot($datay);//,$datax); +$sp1->mark->SetType(MARK_FILLEDCIRCLE); +$sp1->mark->SetFillColor("red"); +$sp1->mark->SetWidth(4); +$sp1->SetImpuls(); +$sp1->SetColor("blue"); +$sp1->SetWeight(3); + +$graph->Add($sp1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +SetScale("intlin"); +$graph->SetShadow(); +$graph->SetBox(); + +$graph->title->Set("Impuls Example 3"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Set format callback for labels +$graph->yaxis->SetLabelFormatCallback("mycallback"); + +// Set X-axis at the minimum value of Y-axis (default will be at 0) +$graph->xaxis->SetPos("min"); // "min" will position the x-axis at the minimum value of the Y-axis + +// Extend the margin for the labels on the Y-axis and reverse the direction +// of the ticks on the Y-axis +$graph->yaxis->SetLabelMargin(12); +$graph->xaxis->SetLabelMargin(6); +$graph->yaxis->SetTickSide(SIDE_LEFT); +$graph->xaxis->SetTickSide(SIDE_DOWN); + +// Create a new impuls type scatter plot +$sp1 = new ScatterPlot($datay); +$sp1->mark->SetType(MARK_SQUARE); +$sp1->mark->SetFillColor("red"); +$sp1->SetImpuls(); +$sp1->SetColor("blue"); +$sp1->SetWeight(1); +$sp1->mark->SetWidth(3); + +$graph->Add($sp1); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/impulsex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,77 @@ +clearTheme(); +$graph->SetScale("intlin"); + +$graph->SetShadow(); +$graph->SetBox(); +$graph->title->Set("Impuls Example 4"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Set some other color then the boring default +$graph->SetColor("lightyellow"); +$graph->SetMarginColor("khaki"); + +// Set legend box specification +$graph->legend->SetFillColor("white"); +$graph->legend->SetLineWeight(2); + +// Set X-axis at the minimum value of Y-axis (default will be at 0) +$graph->xaxis->SetPos("min"); // "min" will position the x-axis at the minimum value of the Y-axis + +// Extend the margin for the labels on the Y-axis and reverse the direction +// of the ticks on the Y-axis +$graph->yaxis->SetLabelMargin(12); +$graph->xaxis->SetLabelMargin(6); +$graph->yaxis->SetTickSide(SIDE_LEFT); +$graph->xaxis->SetTickSide(SIDE_DOWN); + +// Add mark graph with static lines +$line = new PlotLine(HORIZONTAL,0,"black",2); +$graph->AddLine($line); + +// Create a new impuls type scatter plot +$sp1 = new ScatterPlot($datay,$datax); +$sp1->mark->SetType(MARK_SQUARE); +$sp1->mark->SetFillColor("red"); +$sp1->mark->SetWidth(3); + +$sp1->SetImpuls(); +$sp1->SetColor("blue"); +$sp1->SetWeight(1); +$sp1->SetLegend("Non-causal signal"); + +$graph->Add($sp1); + +// Create the envelope plot +$ep1 = new LinePlot($datayenv,$datax); +$ep1->SetStyle("dotted"); +$ep1->SetLegend("Positive envelope"); + +$graph->Add($ep1); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/index.html smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/index.html --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/index.html 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/index.html 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +

Examples of odometers

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/interpolation-growth-log.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/interpolation-growth-log.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/interpolation-growth-log.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/interpolation-growth-log.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetScale('intlog'); +$graph->SetMargin(50,50,20,30); +$graph->SetFrame(false); +$graph->SetBox(true,'black',2); +$graph->SetMarginColor('white'); +$graph->SetColor('lightyellow@0.7'); + +$graph->title->Set('Interpolation growth for size 10x10'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$graph->xaxis->SetTitle('Interpolation factor','center'); +$graph->xaxis->SetTitleMargin(10); + +$graph->SetAxisStyle(AXSTYLE_YBOXIN); +$graph->xgrid->Show(); + +$lp1 = new LinePlot($ydata,$xdata); +$lp1->SetColor('darkred'); +$lp1->SetWeight(3); +$graph->Add($lp1); + +$graph->Stroke(); +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/interpolation-growth.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/interpolation-growth.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/interpolation-growth.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/interpolation-growth.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetScale('intint'); +$graph->SetMargin(50,50,20,30); +$graph->SetFrame(false); +$graph->SetBox(true,'black',2); +$graph->SetMarginColor('white'); +$graph->SetColor('lightyellow@0.7'); + +$graph->title->Set('Interpolation growth for size 10x10'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$graph->xaxis->SetTitle('Interpolation factor','center'); +$graph->xaxis->SetTitleMargin(10); + +$graph->SetAxisStyle(AXSTYLE_YBOXIN); +$graph->xgrid->Show(); + +$lp1 = new LinePlot($ydata,$xdata); +$lp1->SetColor('darkred'); +$lp1->SetWeight(3); +$graph->Add($lp1); + +$graph->Stroke(); +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +clearTheme(); +$graph->SetScale("linlin"); +$graph->img->SetMargin(50,50,60,40); +$graph->SetMarginColor('darkblue'); +$graph->SetColor('darkblue'); +$graph->SetAxisStyle(AXSTYLE_BOXOUT); + +$graph->title->Set("Depth curve. Dive #2"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->title->SetColor("white"); + +$graph->subtitle->Set("(Negated Y-axis)"); +$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL); +$graph->subtitle->SetColor("white"); + +// Setup axis +$graph->yaxis->SetLabelFormatCallback("_cb_negate"); +$graph->xaxis->SetColor("lightblue","white"); +$graph->yaxis->SetColor("lightblue","white"); +$graph->ygrid->SetColor("blue"); + + +$lp1 = new LinePlot($ydata); +$lp1->SetColor("yellow"); +$lp1->SetWeight(2); + + +$graph->Add($lp1); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,52 @@ +clearTheme(); +$graph->SetScale("linlin"); +$graph->img->SetMargin(50,50,60,40); +$graph->SetMarginColor('darkblue'); +$graph->SetColor('darkblue'); +$graph->SetAxisStyle(AXSTYLE_BOXOUT); +$graph->SetBackgroundImage("blueblack400x300grad.png",1); +//$graph->SetBackgroundImage("lightbluedarkblue400x300grad.png",1); + +$graph->title->Set("Depth curve. Dive #2"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->title->SetColor("white"); + +$graph->subtitle->Set("(Negated Y-axis)"); +$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL); +$graph->subtitle->SetColor("white"); + +// Setup axis +$graph->yaxis->SetLabelFormatCallback("_cb_negate"); +$graph->xaxis->SetColor("lightblue","white"); +$graph->yaxis->SetColor("lightblue","white"); +$graph->ygrid->SetColor("blue"); + + +$lp1 = new LinePlot($ydata); +$lp1->SetColor("yellow"); +$lp1->SetWeight(2); + + +$graph->Add($lp1); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/inyaxisex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,68 @@ +clearTheme(); +$graph->SetScale("linlin"); +$graph->SetY2Scale("lin"); +$graph->SetMargin(50,50,60,40); +$graph->SetMarginColor('darkblue'); +$graph->SetColor('darkblue'); + +// Setup titles +$graph->title->Set("Inverting both Y-axis"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->title->SetColor("white"); + +$graph->subtitle->Set("(Negated Y & Y2 axis)"); +$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL); +$graph->subtitle->SetColor("white"); + +// Setup axis +$graph->yaxis->SetLabelFormatCallback("_cb_negate"); +$graph->xaxis->SetColor("lightblue","white"); +$graph->yaxis->SetColor("lightblue","white"); +$graph->ygrid->SetColor("blue"); + +// Setup Y2 axis +$graph->y2axis->SetLabelFormatCallback("_cb_negate"); +$graph->y2axis->SetColor("darkred","white"); +$graph->y2scale->SetAutoMax(0); // To make sure it starts with 0 + +// Setup plot 1 +$lp1 = new LinePlot($ydata); +$lp1->SetColor("yellow"); +$lp1->SetWeight(2); +$graph->Add($lp1); + +// Setup plot 2 +$lp2 = new LinePlot($y2data); +$lp2->SetColor("darkred"); +$lp2->SetWeight(2); +$graph->AddY2($lp2); + +$graph->Stroke(); +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ironrod.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ironrod.jpg differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/jpglogo.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/jpglogo.jpg differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex10.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex10.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex10.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex10.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_KHAKI); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex11.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex11.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex11.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex11.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_OLIVE); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex12.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex12.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex12.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex12.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_LIMEGREEN); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex13.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex13.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex13.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex13.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_FORESTGREEN); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex14.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex14.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex14.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex14.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_TEAL); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex15.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex15.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex15.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex15.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_STEELBLUE); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex16.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex16.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex16.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex16.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_NAVY); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex17.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex17.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex17.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex17.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_INVERTGRAY); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_GREEN); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_RED); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_YELLOW); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,13 @@ +SetSupersampling(2); +$led->StrokeNumber('123.',LEDC_RED); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,13 @@ +SetSupersampling(4); +$led->StrokeNumber('123.',LEDC_RED); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,13 @@ +SetSupersampling(1); +$led->StrokeNumber('123.',LEDC_RED); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_BLUE); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_GRAY); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_CHOCOLATE); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex8.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex8.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex8.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex8.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_PERU); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex9.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex9.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex9.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex9.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,12 @@ +StrokeNumber('0123456789. ABCDEFGHIJKL',LEDC_GOLDENROD); + + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex_cyrillic2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex_cyrillic2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex_cyrillic2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex_cyrillic2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,27 @@ +SetSupersampling(2); +$text = 'Р'. + 'С'. + 'Т'. + 'У'. + 'Ф'. + 'Х'. + 'Ц'. + 'Ч'. + 'Ш'. + 'Щ'. + 'Ъ'. + 'Ы'. + 'Ь'. + 'Э'. + 'Ю'. + 'Я'; +$led->StrokeNumber($text, LEDC_RED); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex_cyrillic.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex_cyrillic.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ledex_cyrillic.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ledex_cyrillic.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,27 @@ +SetSupersampling(2); +$text = 'А'. + 'Б'. + 'В'. + 'Г'. + 'Д'. + 'Е'. + 'Ё'. + 'З'. + 'И'. + 'Й'. + 'К'. + 'Л'. + 'М'. + 'Н'. + 'О'. + 'П'; +$led->StrokeNumber($text, LEDC_RED); + +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/lightbluedarkblue400x300grad.png and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/lightbluedarkblue400x300grad.png differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linebarcentex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linebarcentex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linebarcentex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linebarcentex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +GetShortMonth(); + +// Create the graph. +$graph = new Graph(400,200); +$graph->clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMargin(40,130,20,40); +$graph->SetShadow(); +$graph->xaxis->SetTickLabels($datax); + +// Create the linear error plot +$l1plot=new LinePlot($l1datay); +$l1plot->SetColor("red"); +$l1plot->SetWeight(2); +$l1plot->SetLegend("Prediction"); + +//Center the line plot in the center of the bars +$l1plot->SetBarCenter(); + + +// Create the bar plot +$bplot = new BarPlot($l2datay); +$bplot->SetFillColor("orange"); +$bplot->SetLegend("Result"); + +// Add the plots to t'he graph +$graph->Add($bplot); +$graph->Add($l1plot); + + +$graph->title->Set("Adding a line plot to a bar graph v1"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,74 @@ +clearTheme(); +$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME); +$graph->SetShadow(); + +// Use an integer X-scale +$graph->SetScale("textlin"); + +// Set title and subtitle +$graph->title->Set("Combined bar and line plot"); +$graph->subtitle->Set("100 data points, X-Scale: 'text'"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Make the margin around the plot a little bit bigger +// then default +$graph->img->SetMargin(40,140,40,80); + +// Slightly adjust the legend from it's default position in the +// top right corner to middle right side +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Display every 10:th datalabel +$graph->xaxis->SetTextTickInterval(6); +$graph->xaxis->SetTextLabelInterval(2); +$graph->xaxis->SetTickLabels($databarx); +$graph->xaxis->SetLabelAngle(90); + +// Create a red line plot +$p1 = new LinePlot($datay); +$p1->SetColor("red"); +$p1->SetLegend("Pressure"); + +// Create the bar plot +$b1 = new BarPlot($databary); +$b1->SetLegend("Temperature"); +$b1->SetAbsWidth(6); +$b1->SetShadow(); + +// The order the plots are added determines who's ontop +$graph->Add($p1); +$graph->Add($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ +clearTheme(); +$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME); +$graph->SetShadow(); + +// Use an integer X-scale +$graph->SetScale("intlin"); + +// Set title and subtitle +$graph->title->Set("Combined bar and line plot"); +$graph->subtitle->Set("(\"left\" aligned bars)"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Make the margin around the plot a little bit bigger +// then default +$graph->img->SetMargin(40,120,40,40); + +// Slightly adjust the legend from it's default position in the +// top right corner to middle right side +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Create a red line plot +$p1 = new LinePlot($datay,$datax); +$p1->SetColor("red"); +$p1->SetLegend("Status one"); +$graph->Add($p1); + +// Create the bar plot +$b1 = new BarPlot($databary,$databarx); +$b1->SetLegend("Status two"); +$b1->SetAlign("left"); +$b1->SetShadow(); +$graph->Add($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linebarex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +clearTheme(); +$graph->img->SetMargin(40,180,40,40); +$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME); + +//$graph->img->SetAntiAliasing(); + +$graph->SetScale("intlin"); +$graph->SetShadow(); +$graph->title->Set("Combined bar and line plot"); +$graph->subtitle->Set("(\"center\" aligned bars)"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Slightly adjust the legend from it's default position in the +// top right corner. +$graph->legend->Pos(0.05,0.5,"right","center"); + +// Create the first line + +$p1 = new LinePlot($datay,$datax); +$p1->SetWeight(1); +$p1->SetColor("red"); +$p1->SetLegend("Triumph Tiger -98"); +$graph->Add($p1); + +$b1 = new BarPlot($databary,$databarx); +$b1->SetAbsWidth(10); +$b1->SetAlign("center"); +$b1->SetShadow(); +$graph->Add($b1); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linegraceex.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linegraceex.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linegraceex.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linegraceex.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +clearTheme(); +$graph->img->SetMargin(40,40,40,40); + +$graph->img->SetAntiAliasing(); +$graph->SetScale("textlin"); +$graph->SetShadow(); +$graph->title->Set("Example of 10% top/bottom grace"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Add 10% grace to top and bottom of plot +$graph->yscale->SetGrace(10,10); + +$p1 = new LinePlot($datay); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$p1->SetColor("blue"); +$p1->SetCenter(); +$graph->Add($p1); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/lineiconex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/lineiconex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/lineiconex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/lineiconex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +clearTheme(); +$graph->SetMargin(40,40,20,30); +$graph->SetScale("textlin"); + +$graph->title->Set('Adding an icon ("tux") in the background'); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12); + +//$graph->SetBackgroundGradient('red','blue'); + +$graph->xaxis->SetPos('min'); + +$p1 = new LinePlot($datay); +$p1->SetColor("blue"); +$p1->SetFillGradient('yellow@0.4','red@0.4'); + +$p2 = new LinePlot($datay2); +$p2->SetColor("black"); +$p2->SetFillGradient('green@0.4','white'); + +$p3 = new LinePlot($datay3); +$p3->SetColor("blue"); +$p3->SetFillGradient('navy@0.4','white@0.4'); + +$graph->Add($p1); +$graph->Add($p2); +$graph->Add($p3); + +$icon = new IconPlot('penguin.png',0.2,0.3,1,30); +$icon->SetAnchor('center','center'); +$graph->Add($icon); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/lineiconex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/lineiconex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/lineiconex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/lineiconex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,31 @@ +clearTheme(); +$graph->SetMargin(40,40,20,30); +$graph->SetScale("textlin"); + +$graph->title->Set('Adding a country flag as a an icon'); + +$p1 = new LinePlot($datay); +$p1->SetColor("blue"); +$p1->SetFillGradient('yellow@0.4','red@0.4'); + +$graph->Add($p1); + +$icon = new IconPlot(); +$icon->SetCountryFlag('iceland',50,30,1.5,40,3); +$icon->SetAnchor('left','top'); +$graph->Add($icon); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/lineimagefillex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/lineimagefillex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/lineimagefillex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/lineimagefillex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +title->Set('Education growth'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->SetScale('intlin'); +$graph->SetMarginColor('white'); +$graph->SetBox(); +//$graph->img->SetAntialiasing(); + +$graph->SetGridDepth(DEPTH_FRONT); +$graph->ygrid->SetColor('gray@0.7'); +$graph->SetBackgroundImage('classroom.jpg',BGIMG_FILLPLOT); + +// Masking graph +$p1 = new LinePlot($datay); +$p1->SetFillColor('white'); +$p1->SetFillFromYMax(); +$p1->SetWeight(0); +$graph->Add($p1); + +// Line plot +$p2 = new LinePlot($datay); +$p2->SetColor('black@0.4'); +$p2->SetWeight(3); +$p2->mark->SetType(MARK_SQUARE); +$p2->mark->SetColor('orange@0.5'); +$p2->mark->SetFillColor('orange@0.3'); +$graph->Add($p2); + +// Output line +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linlogex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linlogex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/linlogex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/linlogex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,64 @@ +SetScale("linlog"); +$graph->img->SetMargin(40,20,20,40); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->Set("ab/2"); +$graph->yaxis->title->Set("rho_s"); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->ygrid->Show(true,true); +$graph->xgrid->Show(true,true); + +$errorplot=new ErrorPlot($ydata, $xdata); + +$graph->Add($errorplot); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/listallflags_helper.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/listallflags_helper.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/listallflags_helper.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/listallflags_helper.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,25 @@ +GetImgByIdx($idx); +header ("Content-type: image/png"); +ImagePng ($img); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/listallflags.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/listallflags.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/listallflags.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/listallflags.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,29 @@ +\n"; +$cols=0; +foreach ($flags->iCountryNameMap as $key => $val) { + + echo '
'; + echo "$key
idx=$val\n"; + + if( ++$cols == 5 ) { + echo "\n"; + $cols=0; + } +} + +echo ""; + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/listfontsex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/listfontsex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/listfontsex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/listfontsex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,154 @@ +Set(0,27,0,85); +$g->SetMargin(5,6,5,6); +$g->SetColor('white'); +$g->SetMarginColor("teal"); +$g->InitFrame(); + + +$t = new CanvasRectangleText(); +$t->SetFont(FF_ARIAL,FS_NORMAL,16); +$t->SetFillColor('lemonchiffon2'); +$t->SetFontColor('black'); +$t->Set("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nTTF Fonts (11pt)",0.5,19.5,26,64.5); +$t->Stroke($g->img,$scale); + +$t->SetFillColor('lemonchiffon3'); +$t->Set("\n\n\n\nBitmap Fonts",0.5,5,26,13.5); +$t->Stroke($g->img,$scale); + + +$t = new CanvasRectangleText(); +$t->SetFillColor(''); +$t->SetFontColor('black'); +$t->SetColor(''); +$t->SetShadow(''); + +$t->SetFont(FF_ARIAL,FS_BOLD,18); +$t->Set('Normal',1,1,8); +$t->Stroke($g->img,$scale); + +$t->Set('Italic style',9,1,8); +$t->Stroke($g->img,$scale); + +$t->Set('Bold style',17.5,1,8); +$t->Stroke($g->img,$scale); + + +$t->SetFillColor('yellow'); +$t->SetFontColor('black'); +$t->SetColor('black'); +$t->SetShadow('gray'); + +$r=6;$c=1;$w=7.5;$h=3.5; + +$fonts=array( + array("Font 0",FF_FONT0,FS_NORMAL), + array("",FF_FONT0,FS_ITALIC), + array("",FF_FONT0,FS_BOLD), + + array("Font 1",FF_FONT1,FS_NORMAL), + array("",FF_FONT1,FS_ITALIC), + array("Font 1 bold",FF_FONT1,FS_BOLD), + + array("Font 2",FF_FONT2,FS_NORMAL), + array("",FF_FONT2,FS_ITALIC), + array("Font 2 bold",FF_FONT2,FS_BOLD), + + array("Arial",FF_ARIAL,FS_NORMAL), + array("Arial italic",FF_ARIAL,FS_ITALIC), + array("Arial bold",FF_ARIAL,FS_BOLD), + + array("Verdana",FF_VERDANA,FS_NORMAL), + array("Verdana italic",FF_VERDANA,FS_ITALIC), + array("Verdana bold",FF_VERDANA,FS_BOLD), + + + array("Trebuche",FF_TREBUCHE,FS_NORMAL), + array("Trebuche italic",FF_TREBUCHE,FS_ITALIC), + array("Trebuche bold",FF_TREBUCHE,FS_BOLD), + + array("Georgia",FF_GEORGIA,FS_NORMAL), + array("Georgia italic",FF_GEORGIA,FS_ITALIC), + array("Georgia bold",FF_GEORGIA,FS_BOLD), + + array("Comic",FF_COMIC,FS_NORMAL), + array("",FF_COMIC,FS_ITALIC), + array("Comic bold",FF_COMIC,FS_BOLD), + + array("Courier",FF_COURIER,FS_NORMAL), + array("Courier italic",FF_COURIER,FS_ITALIC), + array("Courier bold",FF_COURIER,FS_BOLD), + + array("Times normal",FF_TIMES,FS_NORMAL), + array("Times italic",FF_TIMES,FS_ITALIC), + array("Times bold",FF_TIMES,FS_BOLD), + + array("Vera normal",FF_VERA,FS_NORMAL), + array("Vera italic",FF_VERA,FS_ITALIC), + array("Vera bold",FF_VERA,FS_BOLD), + + array("Vera mono normal",FF_VERAMONO,FS_NORMAL), + array("Vera mono italic",FF_VERAMONO,FS_ITALIC), + array("Vera mono bold",FF_VERAMONO,FS_BOLD), + + array("Vera serif normal",FF_VERASERIF,FS_NORMAL), + array("",FF_VERASERIF,FS_ITALIC), + array("Vera serif bold",FF_VERASERIF,FS_BOLD), + + array("DejaVu sans serif",FF_DV_SANSSERIF,FS_NORMAL), + array("DejaVu sans serif",FF_DV_SANSSERIF,FS_ITALIC), + array("DejaVu sans serif",FF_DV_SANSSERIF,FS_BOLD), + + array("DejaVu serif",FF_DV_SERIF,FS_NORMAL), + array("DejaVu serif",FF_DV_SERIF,FS_ITALIC), + array("DejaVu serif",FF_DV_SERIF,FS_BOLD), + + array("DejaVuMono sans serif",FF_DV_SANSSERIFMONO,FS_NORMAL), + array("DejaVuMono sans serif",FF_DV_SANSSERIFMONO,FS_ITALIC), + array("DejaVuMono sans serif",FF_DV_SANSSERIFMONO,FS_BOLD), + + array("DejaVuCond serif",FF_DV_SERIFCOND,FS_NORMAL), + array("DejaVuCond serif",FF_DV_SERIFCOND,FS_ITALIC), + array("DejaVuCond serif",FF_DV_SERIFCOND,FS_BOLD), + + array("DejaVuCond sans serif",FF_DV_SANSSERIFCOND,FS_NORMAL), + array("DejaVuCond sans serif",FF_DV_SANSSERIFCOND,FS_ITALIC), + array("DejaVuCond sans serif",FF_DV_SANSSERIFCOND,FS_BOLD), + + ); + + +$n=count($fonts); + +for( $i=0; $i < $n; ++$i ) { + + if( $i==9 ) $r += 3; + + if( $fonts[$i][0] ) { + $t->SetTxt($fonts[$i][0]); + $t->SetPos($c,$r,$w,$h); + $t->SetFont($fonts[$i][1],$fonts[$i][2],11); + $t->Stroke($g->img,$scale); + } + + $c += $w+1; + if( $c > 30-$w-2 ) { + $c = 1; + $r += 4; + } + +} + +$g->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/logbarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/logbarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/logbarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/logbarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +clearTheme(); +//$graph->img->SetMargin(50,30,50,50); +$graph->SetScale("textlog"); +//$graph->SetShadow(); + +// Setup titles for graph and axis +$graph->title->Set("Bar with logarithmic Y-scale"); +$graph->title->SetFont(FF_VERDANA,FS_NORMAL,18); + +$graph->xaxis->SetTitle("2002"); +$graph->xaxis->title->SetFont(FF_ARIAL,FS_NORMAL,16); + +$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,16); +$graph->yaxis->SetTitle("Y-title",'center'); +$graph->yaxis->SetTitleMargin(30); + +// Setup month on X-scale +//$graph->xaxis->SetTickLabels($datax); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); + +//You can also set a manual base of the bars +//$bplot->SetYBase(0.001); + +/* +$bplot->SetShadow(); +$bplot->value->Show(); +$bplot->value->SetFont(FF_ARIAL,FS_BOLD); +$bplot->value->SetAngle(45); +$bplot->value->SetColor("black","darkred"); +*/ + +$graph->Add($bplot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/loglogex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/loglogex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/loglogex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/loglogex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,59 @@ +SetScale("loglog"); +$graph->SetY2Scale("lin"); +$graph->y2axis->SetColor("blue","blue"); + +$graph->img->SetMargin(50,70,40,50); +$graph->title->Set("Geoelektrik"); +$graph->xaxis->title->Set("Auslage ab/2 [m]"); +$graph->yaxis->title->Set("rho_s [Ohm m]"); +$graph->y2axis->title->Set("mn/2 [m]"); +$graph->y2axis->title->SetColor("blue"); +$graph->y2axis->SetTitleMargin(35); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xgrid->Show(true,true); +$graph->ygrid->Show(true,true); + +// Create the linear plot + +$lineplot=new LinePlot($rhos,$ab2); +$lineplot->SetWeight(1); +$lineplot->mark->SetType(MARK_FILLEDCIRCLE); +$lineplot->mark->SetWidth(2); + +// Create scatter plot + +$scplot=new ScatterPlot($mn2,$ab2); +$scplot->mark->SetType(MARK_FILLEDCIRCLE); +$scplot->mark->SetColor("blue"); +$scplot->mark->SetWidth(2); + +// Add plots to the graph + +$graph->AddY2($scplot); +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,22 @@ +SetScale("textlin",3,35); +$graph->yscale->ticks->Set(8,2); + +$graph->title->Set('Manual scale, manual ticks'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$line = new LinePlot($ydata); +$graph->Add($line); + +// Output graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +SetScale("textlin",3,35); + +$graph->title->Set('Manual scale, exact limits'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$line = new LinePlot($ydata); +$graph->Add($line); + +// Output graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +SetScale("textlin",3,35); +$graph->SetTickDensity(TICKD_DENSE); +$graph->yscale->SetAutoTicks(); + +$graph->title->Set('Manual scale, auto ticks'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$line = new LinePlot($ydata); +$graph->Add($line); + +// Output graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manscaleex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,22 @@ +SetScale("textlin",3,35); +$graph->yscale->SetAutoTicks(); + +$graph->title->Set('Manual scale, allow adjustment'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$line = new LinePlot($ydata); +$graph->Add($line); + +// Output graph +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +GetShortMonth(); + +// New graph with a drop shadow +$graph = new Graph(300,200,'auto'); +$graph->clearTheme(); +$graph->SetShadow(); + +// Use a "text" X-scale +$graph->SetScale("textlin"); + +// Specify X-labels +$graph->xaxis->SetTickLabels($months); + +// Set title and subtitle +$graph->title->Set("Textscale with specified labels"); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create the bar plot +$b1 = new BarPlot($databary); +$b1->SetLegend("Temperature"); + +//$b1->SetAbsWidth(6); +//$b1->SetShadow(); + +// The order the plots are added determines who's ontop +$graph->Add($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +GetShortMonth(); + +// New graph with a drop shadow +$graph = new Graph(300,200); +$graph->clearTheme(); +$graph->SetShadow(); + +// Use a "text" X-scale +$graph->SetScale('textlin'); + +// Specify X-labels +$graph->xaxis->SetTickLabels($months); +$graph->xaxis->SetTextTickInterval(2,0); + +// Set title and subtitle +$graph->title->Set('Textscale with tickinterval=2'); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create the bar plot +$b1 = new BarPlot($databary); +$b1->SetLegend('Temperature'); + +// The order the plots are added determines who's ontop +$graph->Add($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +GetShortMonth(); + +// New graph with a drop shadow +$graph = new Graph(300,200); +$graph->clearTheme(); +$graph->SetShadow(); + +// Use a "text" X-scale +$graph->SetScale('textlin'); + +// Specify X-labels +$graph->xaxis->SetTickLabels($months); +$graph->xaxis->SetTextLabelInterval(2); + +// Set title and subtitle +$graph->title->Set('Textscale with tickinterval=2'); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create the bar plot +$b1 = new BarPlot($databary); +$b1->SetLegend('Temperature'); + +// The order the plots are added determines who's ontop +$graph->Add($b1); + +// Finally output the image +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manual_textscale_ex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +GetShortMonth(); +$k=0; +for($i=0; $i < 480; ++$i) { + $datay[$i] = rand(1,40); + if( $i % DATAPERMONTH === 0 ) + $months[$i] = $m[(int)($i/DATAPERMONTH)]; + else + $months[$i] = 'xx'; +} + + +// New graph with a drop shadow +$graph = new Graph(400,200); +//$graph->SetShadow(); + +// Use a "text" X-scale +$graph->SetScale('textlin'); + +// Specify X-labels +$graph->xaxis->SetTickLabels($months); +$graph->xaxis->SetTextTickInterval(DATAPERMONTH,0); +$graph->xaxis->SetTextLabelInterval(2); + +// Set title and subtitle +$graph->title->Set('Textscale with tickinterval=2'); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$graph->SetBox(true,'red'); + +// Create the bar plot +$lp1 = new LinePlot($datay); +$lp1->SetLegend('Temperature'); + +// The order the plots are added determines who's ontop +$graph->Add($lp1); + +// Finally output the image +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex1a.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex1a.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex1a.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex1a.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,72 @@ +GetTicks($datax); + +// We add some grace to the end of the X-axis scale so that the first and last +// data point isn't exactly at the very end or beginning of the scale +$grace = 400000; +$xmin = $datax[0]-$grace; +$xmax = $datax[$n-1]+$grace; + +// +// The code to setup a very basic graph +// +$graph = new Graph(400,200); +$graph->clearTheme(); + +// +// We use an integer scale on the X-axis since the positions on the X axis +// are assumed to be UNI timestamps +$graph->SetScale('intlin',0,0,$xmin,$xmax); +$graph->title->Set('Basic example with manual ticks'); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12); + +// +// Make sure that the X-axis is always at the bottom of the scale +// (By default the X-axis is alwys positioned at Y=0 so if the scale +// doesn't happen to include 0 the axis will not be shown) +$graph->xaxis->SetPos('min'); + +// Now set the tic positions +$graph->xaxis->SetTickPositions($tickPositions,$minTickPositions); + +// The labels should be formatted at dates with "Year-month" +$graph->xaxis->SetLabelFormatString('My',true); + +// Use Ariel font +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); + +// Add a X-grid +$graph->xgrid->Show(); + +// Create the plot line +$p1 = new LinePlot($datay,$datax); +$p1->SetColor('teal'); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,72 @@ +GetTicks($datax); + +// We add some grace to the end of the X-axis scale so that the first and last +// data point isn't exactly at the very end or beginning of the scale +$grace = 400000; +$xmin = $datax[0]-$grace; +$xmax = $datax[$n-1]+$grace; + +// +// The code to setup a very basic graph +// +$graph = new Graph(400,200); +$graph->clearTheme(); + +// +// We use an integer scale on the X-axis since the positions on the X axis +// are assumed to be UNI timestamps +$graph->SetScale('intlin',0,0,$xmin,$xmax); +$graph->title->Set('Basic example with manual ticks'); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12); + +// +// Make sure that the X-axis is always at the bottom of the scale +// (By default the X-axis is alwys positioned at Y=0 so if the scale +// doesn't happen to include 0 the axis will not be shown) +$graph->xaxis->SetPos('min'); + +// Now set the tic positions +$graph->xaxis->SetTickPositions($tickPositions,$minTickPositions); + +// The labels should be formatted at dates with "Year-month" +$graph->xaxis->SetLabelFormatString('My',true); + +// Use Ariel font +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); + +// Add a X-grid +$graph->xgrid->Show(); + +// Create the plot line +$p1 = new LinePlot($datay,$datax); +$p1->SetColor('teal'); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,71 @@ +E(0,10); + +// Now get labels at 1/2 PI intervall +$tickPositions = array(); +$tickLabels = array(); +$tickPositions[0] = 0; +$tickLabels[0] = '0'; +for($i=1; $i/2*M_PI < 11 ; ++$i ) { + $tickPositions[$i] = $i/2*M_PI; + if( $i % 2 ) + $tickLabels[$i] = $i.'/2'.SymChar::Get('pi'); + else + $tickLabels[$i] = ($i/2).SymChar::Get('pi'); +} + +$n = count($datax); +$xmin = $datax[0]; +$xmax = $datax[$n-1]; + +// +// The code to setup a very basic graph +// +$graph = new Graph(400,200); +$graph->clearTheme(); + +// +// We use an integer scale on the X-axis since the positions on the X axis +// are assumed to be UNI timestamps +$graph->SetScale('linlin',0,0,$xmin,$xmax); +$graph->title->Set('Example with manual tick labels'); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,12); + +// +// Make sure that the X-axis is always at the bottom of the scale +// (By default the X-axis is alwys positioned at Y=0 so if the scale +// doesn't happen to include 0 the axis will not be shown) +$graph->xaxis->SetPos('min'); + +// Now set the tic positions +$graph->xaxis->SetMajTickPositions($tickPositions,$tickLabels); + +// Use Times font +$graph->xaxis->SetFont(FF_TIMES,FS_NORMAL,10); +$graph->yaxis->SetFont(FF_TIMES,FS_NORMAL,10); + +// Add a X-grid +$graph->xgrid->Show(); + +// Create the plot line +$p1 = new LinePlot($datay,$datax); +$p1->SetColor('teal'); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,90 @@ +E(0,10); + +// Now get labels at 1/2 PI intervall +$tickPositions = array(); +$tickLabels = array(); +$tickPositions[0] = 0; +$tickLabels[0] = '0'; +for($i=1; $i/2*M_PI < 11 ; ++$i ) { + $tickPositions[$i] = $i/2*M_PI; + if( $i % 2 ) + $tickLabels[$i] = $i.'/2'.SymChar::Get('pi'); + else + $tickLabels[$i] = ($i/2).SymChar::Get('pi'); +} + +$n = count($datax); +$xmin = $datax[0]; +$xmax = $datax[$n-1]; + +// +// The code to setup a very basic graph +// +$graph = new Graph(400,200); +$graph->clearTheme(); + +// We use an integer scale on the X-axis since the positions on the X axis +// are assumed to be UNI timestamps +$graph->SetScale('linlin',0,0,$xmin,$xmax); +$graph->title->Set('Example with manual tick labels'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->SetColor('white'); + +// Setup a abackground gradient +$graph->SetBackgroundGradient('darkred:0.7', 'black', 2, BGRAD_MARGIN); +$graph->SetPlotGradient('black','darkred:0.8', 2); + +// Make sure that the X-axis is always at the bottom of the scale +// (By default the X-axis is alwys positioned at Y=0 so if the scale +// doesn't happen to include 0 the axis will not be shown) +$graph->xaxis->SetPos('min'); + +// Now set the tic positions +$graph->xaxis->SetMajTickPositions($tickPositions,$tickLabels); + +// Use Times font +$graph->xaxis->SetFont(FF_TIMES,FS_NORMAL,11); +$graph->yaxis->SetFont(FF_TIMES,FS_NORMAL,9); + +// Set colors for axis +$graph->xaxis->SetColor('lightgray'); +$graph->yaxis->SetColor('lightgray'); + +// Add a X-grid +$graph->xgrid->Show(); + +// Show ticks outwards +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->xaxis->SetLabelMargin(8); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Setup a filled y-grid +//$graph->ygrid->SetFill(true,'darkgray:1.55@0.7','darkgray:1.6@0.7'); +$graph->ygrid->SetStyle('dotted'); +$graph->xgrid->SetStyle('dashed'); + +// Create the plot line +$p1 = new LinePlot($datay,$datax); +$p1->SetWeight(2); +$p1->SetColor('orange:0.9'); +$p1->SetFillColor('white@0.7'); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/manualtickex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,91 @@ +E(0,10); + +// Now get labels at 1/2 PI intervall +$tickPositions = array(); +$tickLabels = array(); +$tickPositions[0] = 0; +$tickLabels[0] = '0'; +for($i=1; $i/2*M_PI < 11 ; ++$i ) { + $tickPositions[$i] = $i/2*M_PI; + if( $i % 2 ) + $tickLabels[$i] = $i.'/2'.SymChar::Get('pi'); + else + $tickLabels[$i] = ($i/2).SymChar::Get('pi'); +} + +$n = count($datax); +$xmin = $datax[0]; +$xmax = $datax[$n-1]; + +// +// The code to setup a very basic graph +// +$graph = new Graph(400,200); +$graph->clearTheme(); + +// We use an integer scale on the X-axis since the positions on the X axis +// are assumed to be UNI timestamps +$graph->SetScale('linlin',0,0,$xmin,$xmax); +$graph->title->Set('Example with manual tick labels'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->SetColor('white'); + +// Setup a abackground gradient +$graph->SetBackgroundGradient('darkred:0.7', 'black', 2, BGRAD_MARGIN); +$graph->SetPlotGradient('black','darkred:0.8', 2); + +// Make sure that the X-axis is always at the bottom of the scale +// (By default the X-axis is alwys positioned at Y=0 so if the scale +// doesn't happen to include 0 the axis will not be shown) +$graph->xaxis->SetPos('min'); + +// Now set the tic positions +$graph->xaxis->SetMajTickPositions($tickPositions,$tickLabels); + +// Use Times font +$graph->xaxis->SetFont(FF_TIMES,FS_NORMAL,11); +$graph->yaxis->SetFont(FF_TIMES,FS_NORMAL,9); + +// Set colors for axis +$graph->xaxis->SetColor('lightgray'); +$graph->yaxis->SetColor('lightgray'); + +// Add a X-grid +$graph->xgrid->Show(); + +// Show ticks outwards +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->xaxis->SetLabelMargin(8); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Setup a filled y-grid +//$graph->ygrid->SetFill(true,'darkgray:1.55@0.7','darkgray:1.6@0.7'); +$graph->ygrid->SetStyle('dotted'); +$graph->xgrid->SetStyle('dashed'); + +// Create the plot line +$p1 = new LinePlot($datay,$datax); +$p1->SetWeight(2); +$p1->SetColor('orange:0.9'); +$p1->SetFillColor('white@0.7'); +$p1->SetFillFromYMin(); +$graph->Add($p1); + +// Output graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/markflagex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/markflagex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/markflagex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/markflagex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,73 @@ +clearTheme(); +$graph->SetMarginColor('white'); +$graph->SetScale("textlin"); +$graph->SetFrame(false); +$graph->SetMargin(30,5,25,20); + +// Enable X-grid as well +$graph->xgrid->Show(); + +// Use months as X-labels +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +//------------------------ +// Create the plots +//------------------------ +$p1 = new LinePlot($datay[0]); +$p1->SetColor("navy"); + +// Use a flag +$p1->mark->SetType(MARK_FLAG1,197); + +// Displayes value on top of marker image +$p1->value->SetFormat('%d mil'); +$p1->value->Show(); +$p1->value->SetColor('darkred'); +$p1->value->SetFont(FF_ARIAL,FS_BOLD,10); +// Increase the margin so that the value is printed avove tje +// img marker +$p1->value->SetMargin(14); + +// Incent the X-scale so the first and last point doesn't +// fall on the edges +$p1->SetCenter(); + +$graph->Add($p1); + +//------------ +// 2:nd plot +//------------ +$p2 = new LinePlot($datay[1]); +$p2->SetColor("navy"); + +// Use a flag +$p2->mark->SetType(MARK_FLAG1,'united states'); + +// Displayes value on top of marker image +$p2->value->SetFormat('%d mil'); +$p2->value->Show(); +$p2->value->SetColor('darkred'); +$p2->value->SetFont(FF_ARIAL,FS_BOLD,10); +// Increase the margin so that the value is printed avove tje +// img marker +$p2->value->SetMargin(14); + +// Incent the X-scale so the first and last point doesn't +// fall on the edges +$p2->SetCenter(); +$graph->Add($p2); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_csimex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_csimex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_csimex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_csimex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,76 @@ +SetBackgroundGradient('lightsteelblue:0.8','lightsteelblue:0.3'); +$graph->title->Set('CSIM with matrix'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->SetColor('white'); + +// Create one matrix plot +$mp = new MatrixPlot($data,1); +$mp->SetModuleSize(13,15); +$mp->SetCenterPos(0.35,0.6); +$mp->colormap->SetNullColor('gray'); + +// Setup column lablels +$mp->collabel->Set($collabels); +$mp->collabel->SetSide('top'); +$mp->collabel->SetFont(FF_ARIAL,FS_NORMAL,8); +$mp->collabel->SetFontColor('lightgray'); + +// Setup row lablels +$mp->rowlabel->Set($rowlabels); +$mp->rowlabel->SetSide('right'); +$mp->rowlabel->SetFont(FF_ARIAL,FS_NORMAL,8); +$mp->rowlabel->SetFontColor('lightgray'); + +$mp->rowlabel->SetCSIMTargets($rowlabeltargets); +$mp->collabel->SetCSIMTargets($collabeltargets); + +// Move the legend more to the right +$mp->legend->SetMargin(90); +$mp->legend->SetColor('white'); +$mp->legend->SetFont(FF_VERDANA,FS_BOLD,10); + +$mp->SetCSIMTargets($csimtargets); + +$graph->Add($mp); +$graph->StrokeCSIM(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_edgeex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_edgeex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_edgeex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_edgeex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +SetMarginColor('white'); +$graph->title->Set('Adding labels on the edges'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +// Create one matrix plot +$mp = new MatrixPlot($data,1); +$mp->SetModuleSize(13,15); +$mp->SetCenterPos(0.35,0.45); +$mp->colormap->SetNullColor('gray'); + +// Setup column lablels +$mp->collabel->Set($xlabels); +$mp->collabel->SetSide('bottom'); +$mp->collabel->SetFont(FF_ARIAL,FS_NORMAL,8); +$mp->collabel->SetFontColor('darkgray'); + +// Setup row lablels +$mp->rowlabel->Set($ylabels); +$mp->rowlabel->SetSide('right'); +$mp->rowlabel->SetFont(FF_ARIAL,FS_NORMAL,8); +$mp->rowlabel->SetFontColor('darkgray'); + +// Move the legend more to the right +$mp->legend->SetMargin(90); + +$graph->Add($mp); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_edgeex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_edgeex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_edgeex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_edgeex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +title->Set('Add ine row/col labels'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +$mp = new MatrixPlot($data,1); +$mp->SetSize(0.55); +$mp->SetCenterPos(0.45, 0.45); + +$rowtitles = array(); +for( $i=0; $i < $nrow; ++$i ) { + $rowtitles[$i] = sprintf('Row: %02d',$i); +} +$coltitles = array(); +for( $i=0; $i < $ncol; ++$i ) { + $coltitles[$i] = sprintf('Col: %02d',$i); +} + +$mp->rowlabel->Set($rowtitles); +$mp->rowlabel->SetFont(FF_ARIAL,FS_NORMAL,10); +$mp->rowlabel->SetFontColor('blue'); +$mp->rowlabel->SetSide('left'); + +$mp->collabel->Set($coltitles); +$mp->collabel->SetFont(FF_ARIAL,FS_NORMAL,10); +$mp->collabel->SetFontColor('darkred'); +$mp->collabel->SetAngle(70); // 90 is default for col titles +$mp->collabel->SetSide('bottom'); + +$graph->Add($mp); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrixex00.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrixex00.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrixex00.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrixex00.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,59 @@ +title->Set('Matrix example 00'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +//$graph->SetColor('darkgreen@0.8'); + +$mp = array(); +$n = 5; +for($i=0; $i < $n; ++$i){ + $mp[$i] = new MatrixPlot($data); + $mp[$i]->colormap->SetMap($i); + if( $i < 2 ) + $mp[$i]->SetSize(0.35); + else + $mp[$i]->SetSize(0.21); +} + +$hor1 = new LayoutHor(array($mp[0],$mp[1])); +$hor2 = new LayoutHor(array($mp[2],$mp[3],$mp[4])); +$vert = new LayoutVert(array($hor1,$hor2)); +$vert->SetCenterPos(0.45,0.5); + +//$mp = new MatrixPlot($data); +//$mp->colormap->SetMap(2); +//$mp->SetCenterPos(0.5, 0.45); +//$mp->SetLegendLayout(0); +//$mp->SetSize(0.6); +//$mp->legend->Show(false); +//$mp->SetModuleSize(5,5); + +//$mp->legend->SetModuleSize(20,4); +//$mp->legend->SetSize(20,0.5); + +//$t = new Text('A text string',10,10); +//$graph->Add($t); + +//$graph->Add($mp); + +$graph->Add($vert); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +title->Set('Possible legend positions'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +$mp = array(); +$n = 4; +$pos = array(0.3,0.33, 0.8,0.68, + 0.3,0.68, 0.8,0.33); +for($i=0; $i < $n; ++$i){ + $mp[$i] = new MatrixPlot($data); + $mp[$i]->colormap->SetMap($i); + $mp[$i]->SetModuleSize(4,5); + $mp[$i]->SetLegendLayout($i); + $mp[$i]->SetCenterPos($pos[$i*2],$pos[$i*2+1]); +} + +$graph->Add($mp); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,32 @@ +title->Set('Meshinterpolation=3'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +$mp = new MatrixPlot($data,1); +$mp->colormap->SetMap(0); +$mp->SetSize(200,160); +$mp->SetCenterPos(0.5,0.55); +$mp->legend->Show(false); +$graph->Add($mp); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +title->Set('Adding an icon to the background'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +$mp = new MatrixPlot($data,1); +$mp->SetSize(0.6); + +$icon = new IconPlot('icon.jpg',$width-1,$height-1,0.8,50); +$icon->SetAnchor('right','bottom'); +$graph->Add($icon); + +$graph->Add($mp); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +title->Set('Adding a background image'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->subtitle->Set('Alphablending = 0.2'); + +// Add a stretched background image +$graph->SetBackgroundImage('ironrod.jpg',BGIMG_FILLFRAME); +$graph->SetBackgroundImageMix(50); + +$mp = new MatrixPlot($data,1); +$mp->SetSize(0.65); +$mp->SetCenterPos(0.5,0.5); +$mp->SetLegendLayout(1); +$mp->SetAlpha(0.2); + +$graph->Add($mp); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +title->Set('Adding a background image'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->subtitle->Set('Alphablending = 0.7'); + +// Add a stretched background image +$graph->SetBackgroundImage('ironrod.jpg',BGIMG_FILLFRAME); +$graph->SetBackgroundImageMix(50); + +$mp = new MatrixPlot($data,1); +$mp->SetSize(0.65); +$mp->SetCenterPos(0.5,0.5); +$mp->SetLegendLayout(1); +$mp->SetAlpha(0.7); + +$graph->Add($mp); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex04.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +title->Set('Adding a background image'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +// Add a stretched background image +$graph->SetBackgroundImage('ironrod.jpg',BGIMG_FILLFRAME); +$graph->SetBackgroundImageMix(50); + +$mp = new MatrixPlot($data,1); +$mp->SetSize(0.6); +$mp->SetCenterPos(0.5,0.5); +$mp->SetLegendLayout(1); + +$graph->Add($mp); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex05.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex05.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex05.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex05.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,31 @@ +title->Set('Using a circular module type'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +$mp = new MatrixPlot($data,2); +$mp->SetSize(0.85); +$mp->SetModuleType(1); +$mp->SetBackgroundColor('teal:1.8'); +$mp->SetCenterPos(0.5,0.45); +$mp->SetLegendLayout(1); + +$graph->Add($mp); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex06.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex06.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex06.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex06.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,75 @@ +SetBackgroundGradient('lightsteelblue:0.8','lightsteelblue:0.3'); +$graph->title->Set('Matrix with lines'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,18); +$graph->title->SetColor('white'); + +// Create two lines to add as markers +$l1 = new PlotLine(VERTICAL, 5, 'lightgray:1.5', 4); +$l2 = new PlotLine(HORIZONTAL, 3, 'lightgray:1.5', 4); + +// Create one matrix plot +$mp = new MatrixPlot($data,1); +$mp->SetModuleSize(13,15); +$mp->SetCenterPos(0.35,0.6); +$mp->colormap->SetNullColor('gray'); + +// Add lines +$mp->AddLine($l1); +$mp->AddLine($l2); +// this could also be done as +// $mp->AddLine(array($l1,$l2)); + +// Setup column lablels +$mp->collabel->Set($collabels); +$mp->collabel->SetSide('top'); +$mp->collabel->SetFont(FF_ARIAL,FS_NORMAL,8); +$mp->collabel->SetFontColor('lightgray'); + +// Setup row lablels +$mp->rowlabel->Set($rowlabels); +$mp->rowlabel->SetSide('right'); +$mp->rowlabel->SetFont(FF_ARIAL,FS_NORMAL,8); +$mp->rowlabel->SetFontColor('lightgray'); + +// Move the legend more to the right +$mp->legend->SetMargin(90); +$mp->legend->SetColor('white'); +$mp->legend->SetFont(FF_VERDANA,FS_BOLD,10); + +$graph->Add($mp); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,28 @@ +title->Set('Basic matrix example'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +// Create a ,atrix plot using all default values +$mp = new MatrixPlot($data); +$graph->Add($mp); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_introex.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_introex.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_introex.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_introex.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,89 @@ +Push(); + +//-------------------------------------------------------------- +// Setup a basic matrix graph +//-------------------------------------------------------------- +$width = 740; $height = 500; +$graph = new MatrixGraph($width,$height); +$graph->SetMargin(1,2,70,1); +$graph->SetColor('white'); +$graph->SetMarginColor('#fafafa'); +$graph->title->Set('Intro matrix graph'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +// Setup the background image +$graph->SetBackgroundImage('fireplace.jpg',BGIMG_FILLPLOT); +$graph->SetBackgroundImageMix(50); + +// Setup the timer in the right footer +$graph->footer->SetTimer($timer); +$graph->footer->right->SetColor('white'); + +//-------------------------------------------------------------- +// Create the 2 matrix plots +//-------------------------------------------------------------- +$mp = array(); $n = 2; +for($i=0; $i < $n; ++$i){ + $mp[$i] = new MatrixPlot($data); + $mp[$i]->colormap->SetMap($i); + $mp[$i]->SetSize(300,250); + $mp[$i]->SetLegendLayout(1); + $mp[$i]->SetAlpha(0.2); + + // Make the legend slightly longer than default + $mp[$i]->legend->SetSize(20,280); +} +$mp[1]->colormap->SetMap(3); + +$hor1 = new LayoutHor(array($mp[0],$mp[1])); +$hor1->SetCenterPos(0.5,0.5); + +$graph->Add($hor1); + +//-------------------------------------------------------------- +// Add texts to the graph +//-------------------------------------------------------------- +$txts = array( + array('Temperature gradient',$width/2,80), + array('Heat color map',200,110), + array('High contrast map',560,110)); + +$n=count($txts); +$t=array(); +for($i=0; $i < $n; ++$i){ + $t[$i] = new Text($txts[$i][0],$txts[$i][1],$txts[$i][2]); + $t[$i]->SetFont(FF_ARIAL,FS_BOLD,14); + $t[$i]->SetColor('white'); + $t[$i]->SetAlign('center','top'); +} +$graph->Add($t); + +//-------------------------------------------------------------- +// Add Jpgraph logo to top left corner +//-------------------------------------------------------------- +$icon = new IconPlot('jpglogo.jpg',2,2,0.9,50); +$graph->Add($icon); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_layout_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_layout_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_layout_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/matrix_layout_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,44 @@ +title->Set('Matrix layout example'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +$mp = array(); +$n = 5; +for($i=0; $i < $n; ++$i){ + $mp[$i] = new MatrixPlot($data); + $mp[$i]->colormap->SetMap($i); + if( $i < 2 ) + $mp[$i]->SetSize(0.35); + else + $mp[$i]->SetSize(0.21); + // We need to make the legend a bit smaller since by + // defalt has a ~45% height + $mp[$i]->legend->SetModuleSize(15,2); +} + +$hor1 = new LayoutHor(array($mp[0],$mp[1])); +$hor2 = new LayoutHor(array($mp[2],$mp[3],$mp[4])); +$vert = new LayoutVert(array($hor1,$hor2)); +$vert->SetCenterPos(0.45,0.5); + +$graph->Add($vert); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/meteo_72h.csv smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/meteo_72h.csv --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/meteo_72h.csv 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/meteo_72h.csv 2020-11-07 06:55:38.000000000 +0000 @@ -0,0 +1,865 @@ +4-11-2020 16:50;1035,3;10,2;75;0;0;00;N;16;0 +4-11-2020 16:55;1035,4;9,9;76;0;0;00;N;16;0 +4-11-2020 17:00;1035,5;9,6;77;0;0;00;N;16;0 +4-11-2020 17:05;1035,6;9,3;77;0;0;00;N;16;0 +4-11-2020 17:10;1035,7;8,9;78;0;0;00;N;16;0 +4-11-2020 17:15;1035,6;8,8;79;0;0;00;N;16;0 +4-11-2020 17:20;1035,8;8,6;80;0;0;00;N;16;0 +4-11-2020 17:25;1035,7;8,4;80;0;0;00;N;16;0 +4-11-2020 17:30;1035,7;8,2;81;0;0;00;N;16;0 +4-11-2020 17:35;1035,7;8;82;0;0;00;N;16;0 +4-11-2020 17:40;1035,7;7,9;83;0;0;00;N;16;0 +4-11-2020 17:45;1035,7;7,8;84;0;0;00;N;16;0 +4-11-2020 17:50;1035,7;7,7;84;0;0;00;N;16;0 +4-11-2020 17:55;1035,8;7,5;85;0;0;00;N;16;0 +4-11-2020 18:00;1035,9;7,3;85;0;0;00;N;16;0 +4-11-2020 18:05;1036;7,3;86;0;0;00;N;16;0 +4-11-2020 18:10;1036,1;7,2;87;0;0;00;N;16;0 +4-11-2020 18:15;1036,1;7,1;87;0;0;00;N;16;0 +4-11-2020 18:20;1036,2;6,8;87;0;0;00;N;16;0 +4-11-2020 18:25;1036,2;6,7;88;0;0;00;N;16;0 +4-11-2020 18:30;1036,3;6,5;88;0;0;00;N;16;0 +4-11-2020 18:35;1036,5;6,3;88;0;0;00;N;16;0 +4-11-2020 18:40;1036,5;6,2;89;0;0;00;N;16;0 +4-11-2020 18:45;1036,6;6;89;0;0;00;N;16;0 +4-11-2020 18:50;1036,6;5,9;89;0;0;00;N;16;0 +4-11-2020 18:55;1036,7;5,8;90;0;0;00;N;16;0 +4-11-2020 19:00;1036,8;5,8;90;0;0;00;N;16;0 +4-11-2020 19:05;1036,9;5,7;90;0;0;00;N;16;0 +4-11-2020 19:10;1037;5,6;90;0;0;00;N;16;0 +4-11-2020 19:15;1037,1;5,5;90;0;0;00;N;16;0 +4-11-2020 19:20;1037,1;5,4;91;0;0;00;N;16;0 +4-11-2020 19:25;1037,3;5,4;91;0;0;00;N;16;0 +4-11-2020 19:30;1037,4;5,3;91;0;0;00;N;16;0 +4-11-2020 19:35;1037,4;5,3;91;0;0;00;N;16;0 +4-11-2020 19:40;1037,5;5,2;92;0;0;00;N;16;0 +4-11-2020 19:45;1037,5;5,1;91;0;0;00;N;16;0 +4-11-2020 19:50;1037,5;4,9;92;0;0;00;N;16;0 +4-11-2020 19:55;1037,4;4,8;92;0;0;00;N;16;0 +4-11-2020 20:00;1037,5;4,8;93;0;0;00;N;16;0 +4-11-2020 20:05;1037,5;4,7;92;0;0;00;N;16;0 +4-11-2020 20:10;1037,5;4,6;93;0;0;00;N;16;0 +4-11-2020 20:15;1037,6;4,6;93;0;0;00;N;16;0 +4-11-2020 20:20;1037,6;4,6;93;0;0;00;N;16;0 +4-11-2020 20:25;1037,6;4,6;93;0;0;00;N;16;0 +4-11-2020 20:30;1037,7;4,5;93;0;0;00;N;16;0 +4-11-2020 20:35;1037,8;4,4;93;0;0;00;N;16;0 +4-11-2020 20:40;1037,8;4,3;93;0;0;00;N;16;0 +4-11-2020 20:45;1037,8;4,2;93;0;0;00;N;16;0 +4-11-2020 20:50;1037,9;4,1;93;0;0;00;N;16;0 +4-11-2020 20:55;1037,9;4;94;0;0;00;N;16;0 +4-11-2020 21:00;1037,9;3,9;94;0;0;00;N;16;0 +4-11-2020 21:05;1038,1;3,8;94;0;0;00;N;16;0 +4-11-2020 21:10;1038,2;4,1;94;0;0;00;N;16;0 +4-11-2020 21:15;1038,2;4;94;0;0;00;N;16;0 +4-11-2020 21:20;1038,2;4,1;94;0;0;00;N;16;0 +4-11-2020 21:25;1038,2;4;94;0;0;00;N;16;0 +4-11-2020 21:30;1038,3;3,8;94;0;0;00;N;16;0 +4-11-2020 21:35;1038,3;3,7;94;0;0;00;N;16;0 +4-11-2020 21:40;1038,4;3,7;94;0;0;00;N;16;0 +4-11-2020 21:45;1038,4;3,7;94;0;0;00;N;16;0 +4-11-2020 21:50;1038,5;3,6;94;0;0;00;N;16;0 +4-11-2020 21:55;1038,5;3,6;94;0;0;00;N;16;0 +4-11-2020 22:00;1038,5;3,4;94;0;0;00;N;16;0 +4-11-2020 22:05;1038,5;3,3;94;0;0;00;N;16;0 +4-11-2020 22:10;1038,6;3,1;94;0;0;00;N;16;0 +4-11-2020 22:15;1038,6;2,9;94;0;0;00;N;16;0 +4-11-2020 22:20;1038,7;2,8;94;0;0;00;N;16;0 +4-11-2020 22:25;1038,7;2,7;95;0;0;00;N;16;0 +4-11-2020 22:30;1038,7;2,7;95;0;0;00;N;16;0 +4-11-2020 22:35;1038,8;2,7;95;0;0;00;N;16;0 +4-11-2020 22:40;1038,8;2,6;95;0;0;00;N;16;0 +4-11-2020 22:45;1038,8;2,6;95;0;0;00;N;16;0 +4-11-2020 22:50;1038,8;2,6;95;0;0;00;N;16;0 +4-11-2020 22:55;1038,9;2,6;95;0;0;00;N;16;0 +4-11-2020 23:00;1038,9;2,5;95;0;0;00;N;16;0 +4-11-2020 23:05;1038,9;2,4;95;0;0;00;N;16;0 +4-11-2020 23:10;1039;2,2;95;0;0;00;N;16;0 +4-11-2020 23:15;1039;2,3;95;0;0;00;N;16;0 +4-11-2020 23:20;1039;2,4;95;0;0;00;N;16;0 +4-11-2020 23:25;1039;2,4;95;0;0;00;N;16;0 +4-11-2020 23:30;1039,1;2,2;95;0;0;00;N;16;0 +4-11-2020 23:35;1039,1;2,2;95;0;0;00;N;16;0 +4-11-2020 23:40;1039;2,2;95;0;0;00;N;16;0 +4-11-2020 23:45;1039;2,2;95;0;0;00;N;16;0 +4-11-2020 23:50;1039;2,2;95;0;0;00;N;16;0 +4-11-2020 23:55;1039,1;2,3;95;0;0;00;N;16;0 +5-11-2020 00:00;1039,2;2,2;95;0;0;00;N;16;0 +5-11-2020 00:05;1039,2;2,1;95;0;0;00;N;16;0 +5-11-2020 00:10;1039,2;2,1;95;0;0;00;N;16;0 +5-11-2020 00:15;1039,2;2;95;0;0;00;N;16;0 +5-11-2020 00:20;1039,3;1,8;95;0;0;00;N;16;0 +5-11-2020 00:25;1039,4;1,6;95;0;0;00;N;16;0 +5-11-2020 00:30;1039,4;1,4;95;0;0;00;N;16;0 +5-11-2020 00:35;1039,5;1,3;95;0;0;00;N;16;0 +5-11-2020 00:40;1039,6;1,3;96;0;0;00;N;16;0 +5-11-2020 00:45;1039,6;1,2;96;0;0;00;N;16;0 +5-11-2020 00:50;1039,6;1,2;96;0;0;00;N;16;0 +5-11-2020 00:55;1039,6;1,2;96;0;0;00;N;16;0 +5-11-2020 01:00;1039,6;1,1;96;0;0;00;N;16;0 +5-11-2020 01:05;1039,6;1,1;96;0;0;00;N;16;0 +5-11-2020 01:10;1039,6;1,2;96;0;0;00;N;16;0 +5-11-2020 01:15;1039,5;1,3;96;0;0;00;N;16;0 +5-11-2020 01:20;1039,5;1,4;96;0;0;00;N;16;0 +5-11-2020 01:25;1039,5;1,3;96;0;0;00;N;16;0 +5-11-2020 01:30;1039,6;1,2;96;0;0;00;N;16;0 +5-11-2020 01:35;1039,7;1,2;96;0;0;00;N;16;0 +5-11-2020 01:40;1039,6;1,1;96;0;0;00;N;16;0 +5-11-2020 01:45;1039,6;0,9;96;0;0;00;N;16;0 +5-11-2020 01:50;1039,6;0,8;96;0;0;00;N;16;0 +5-11-2020 01:55;1039,7;0,7;96;0;0;00;N;16;0 +5-11-2020 02:00;1039,7;0,6;96;0;0;00;N;16;0 +5-11-2020 02:05;1039,8;0,5;96;0;0;00;N;16;0 +5-11-2020 02:10;1039,6;0,3;96;0;0;00;N;16;0 +5-11-2020 02:15;1039,7;0,3;96;0;0;00;N;16;0 +5-11-2020 02:20;1039,7;0,4;96;0;0;00;N;16;0 +5-11-2020 02:25;1039,6;0,4;96;0;0;00;N;16;0 +5-11-2020 02:30;1039,6;0,3;96;0;0;00;N;16;0 +5-11-2020 02:35;1039,6;0,3;96;0;0;00;N;16;0 +5-11-2020 02:40;1039,5;0,3;96;0;0;00;N;16;0 +5-11-2020 02:45;1039,6;0,3;96;0;0;00;N;16;0 +5-11-2020 02:50;1039,6;0,3;96;0;0;00;N;16;0 +5-11-2020 02:55;1039,5;0,3;96;0;0;00;N;16;0 +5-11-2020 03:00;1039,5;0,4;96;0;0;00;N;16;0 +5-11-2020 03:05;1039,6;0,6;97;0;0;00;N;16;0 +5-11-2020 03:10;1039,5;0,7;96;0;0;00;N;16;0 +5-11-2020 03:15;1039,6;0,6;96;0;0;00;N;16;0 +5-11-2020 03:20;1039,7;0,4;96;0;0;00;N;16;0 +5-11-2020 03:25;1039,6;0,4;96;0;0;00;N;16;0 +5-11-2020 03:30;1039,6;0,4;96;0,2;0;00;N;16;0 +5-11-2020 03:35;1039,6;0,2;96;0;0;00;N;16;0 +5-11-2020 03:40;1039,6;0,2;96;0;0;00;N;16;0 +5-11-2020 03:45;1039,7;0,1;96;0;0;00;N;16;0 +5-11-2020 03:50;1039,6;-0,1;96;0;0;00;N;16;0 +5-11-2020 03:55;1039,6;-0,1;96;0;0;00;N;16;0 +5-11-2020 04:00;1039,7;-0,1;96;0;0;00;N;16;0 +5-11-2020 04:05;1039,6;-0,1;96;0;0;00;N;16;0 +5-11-2020 04:10;1039,6;0;96;0;0;00;N;16;0 +5-11-2020 04:15;1039,7;0,1;97;0;0;00;N;16;0 +5-11-2020 04:20;1039,7;0,1;96;0;0;00;N;16;0 +5-11-2020 04:25;1039,7;0,1;97;0;0;00;N;16;0 +5-11-2020 04:30;1039,7;0,2;97;0;0;00;N;16;0 +5-11-2020 04:35;1039,7;0,2;97;0;0;00;N;16;0 +5-11-2020 04:40;1039,8;0,1;97;0;0;00;N;16;0 +5-11-2020 04:45;1039,8;-0,1;97;0;0;00;N;16;0 +5-11-2020 04:50;1039,8;-0,1;97;0;0;00;N;16;0 +5-11-2020 04:55;1039,9;-0,1;97;0;0;00;N;16;0 +5-11-2020 05:00;1039,9;-0,1;97;0;0;00;N;16;0 +5-11-2020 05:05;1040;-0,2;97;0;0;00;N;16;0 +5-11-2020 05:10;1040;-0,2;97;0;0;00;N;16;0 +5-11-2020 05:15;1040;-0,2;97;0;0;00;N;16;0 +5-11-2020 05:20;1040,1;-0,3;97;0;0;00;N;16;0 +5-11-2020 05:25;1040,1;-0,3;97;0;0;00;N;16;0 +5-11-2020 05:30;1040,2;-0,4;97;0;0;00;N;16;0 +5-11-2020 05:35;1040,1;-0,4;97;0;0;00;N;16;0 +5-11-2020 05:40;1040,1;-0,4;97;0;0;00;N;16;0 +5-11-2020 05:45;1040,1;-0,4;97;0;0;00;N;16;0 +5-11-2020 05:50;1040,1;-0,4;97;0;0;00;N;16;0 +5-11-2020 05:55;1040,1;-0,5;97;0;0;00;N;16;0 +5-11-2020 06:00;1040,1;-0,4;97;0;0;00;N;16;0 +5-11-2020 06:05;1040,2;-0,3;97;0;0;00;N;16;0 +5-11-2020 06:10;1040,2;-0,2;97;0;0;00;N;16;0 +5-11-2020 06:15;1040,1;-0,2;97;0;0;00;N;16;0 +5-11-2020 06:20;1040;-0,2;97;0;0;00;N;16;0 +5-11-2020 06:25;1040;-0,1;97;0;0;00;N;16;0 +5-11-2020 06:30;1040;-0,1;97;0;0;00;N;16;0 +5-11-2020 06:35;1040;-0,2;97;0;0;00;N;16;0 +5-11-2020 06:40;1040;-0,1;97;0;0;00;N;16;0 +5-11-2020 06:45;1040;-0,1;97;0;0;00;N;16;0 +5-11-2020 06:50;1040;0;97;0;0;00;N;16;0 +5-11-2020 06:55;1040;-0,1;97;0;0;00;N;16;0 +5-11-2020 07:00;1040;-0,1;97;0;0;00;N;16;0 +5-11-2020 07:05;1040,1;-0,2;97;0;0;00;N;16;0 +5-11-2020 07:10;1040,1;-0,1;97;0;0;00;N;16;0 +5-11-2020 07:15;1040,1;0;97;0;0;00;N;16;0 +5-11-2020 07:20;1040;-0,1;97;0;0;00;N;16;0 +5-11-2020 07:25;1040;-0,1;97;0;0;00;N;16;0 +5-11-2020 07:30;1040;-0,1;97;0;0;00;N;16;0 +5-11-2020 07:35;1040,1;-0,1;97;0;0;00;N;16;0 +5-11-2020 07:40;1040,2;-0,1;97;0;0;00;N;16;0 +5-11-2020 07:45;1040,2;-0,1;97;0;0;00;N;16;0 +5-11-2020 07:50;1040,2;-0,1;97;0;0;00;N;16;0 +5-11-2020 07:55;1040,2;-0,1;97;0;0;00;N;16;1,6 +5-11-2020 08:00;1040,3;-0,1;97;0;0;00;N;16;0 +5-11-2020 08:05;1040,2;-0,1;97;0;0;00;N;16;0 +5-11-2020 08:10;1040,3;-0,1;97;0;0;00;N;16;0 +5-11-2020 08:15;1040,4;-0,1;97;0;0;00;N;16;0 +5-11-2020 08:20;1040,3;-0,1;97;0;0;00;N;16;0 +5-11-2020 08:25;1040,4;0;97;0;0;00;N;16;0 +5-11-2020 08:30;1040,4;0,1;97;0;0;00;N;16;0 +5-11-2020 08:35;1040,5;0,2;97;0;0;00;N;16;0 +5-11-2020 08:40;1040,5;0,3;97;0;0;00;N;16;0 +5-11-2020 08:45;1040,5;0,4;97;0;0;00;N;16;0 +5-11-2020 08:50;1040,6;0,6;97;0;0;00;N;16;0 +5-11-2020 08:55;1040,5;0,8;98;0;0;00;N;16;0 +5-11-2020 09:00;1040,6;1,1;98;0;0;00;N;16;0 +5-11-2020 09:05;1040,6;1,3;98;0;0;00;N;16;0 +5-11-2020 09:10;1040,6;1,6;98;0;0;00;N;16;0 +5-11-2020 09:15;1040,6;1,8;98;0;0;00;N;16;0 +5-11-2020 09:20;1040,7;2,1;98;0;0;00;N;16;0 +5-11-2020 09:25;1040,6;2,4;98;0;0;00;N;16;0 +5-11-2020 09:30;1040,6;2,5;98;0;0;00;N;16;0 +5-11-2020 09:35;1040,6;2,8;98;0;0;00;N;16;0 +5-11-2020 09:40;1040,7;3,3;98;0;0;00;N;16;0 +5-11-2020 09:45;1040,7;3,6;98;0;0;00;N;16;0 +5-11-2020 09:50;1040,8;3,9;98;0;0;00;N;16;0 +5-11-2020 09:55;1040,7;4,2;98;0;0;00;N;16;0 +5-11-2020 10:00;1040,7;4,4;98;0;0;00;N;16;0 +5-11-2020 10:05;1040,7;4,5;98;0;0;00;N;16;0 +5-11-2020 10:10;1040,7;4,8;98;0;0;00;N;16;0 +5-11-2020 10:15;1040,7;4,8;98;0;0;00;N;6;1,6 +5-11-2020 10:20;1040,8;4,8;98;0;0;00;N;16;1,6 +5-11-2020 10:25;1040,8;4,9;98;0;0;00;N;16;1,6 +5-11-2020 10:30;1040,9;5,1;98;0;0;00;N;16;1,6 +5-11-2020 10:35;1040,9;5,3;98;0;0;00;N;16;1,6 +5-11-2020 10:40;1040,9;5,7;98;0;0;00;N;16;0 +5-11-2020 10:45;1040,9;5,8;98;0;0;00;N;4;1,6 +5-11-2020 10:50;1040,9;6;98;0;0;00;N;16;1,6 +5-11-2020 10:55;1040,9;6,2;98;0;0;00;N;6;1,6 +5-11-2020 11:00;1040,9;6,3;98;0;0;00;N;16;1,6 +5-11-2020 11:05;1041;6,6;98;0;0;00;N;16;0 +5-11-2020 11:10;1041;7;98;0;0;00;N;16;0 +5-11-2020 11:15;1041;7,3;98;0;0;00;N;16;0 +5-11-2020 11:20;1041;7,6;97;0;0;00;N;16;0 +5-11-2020 11:25;1041;7,8;97;0;0;00;N;16;0 +5-11-2020 11:30;1041;7,9;97;0;0;00;N;16;0 +5-11-2020 11:35;1041;8;97;0;0;00;N;16;0 +5-11-2020 11:40;1041;8,3;97;0;0;00;N;16;0 +5-11-2020 11:45;1041;8,6;97;0;0;00;N;16;1,6 +5-11-2020 11:50;1040,9;8,7;97;0;0;00;N;4;3,2 +5-11-2020 11:55;1040,9;8,6;96;0;0;00;N;16;3,2 +5-11-2020 12:00;1040,8;8,7;96;0;0;00;N;4;1,6 +5-11-2020 12:05;1040,7;8,9;96;0;0;00;N;16;0 +5-11-2020 12:10;1040,6;8,9;96;0;0;02;NE;16;3,2 +5-11-2020 12:15;1040,6;9,1;95;0;0;00;N;16;1,6 +5-11-2020 12:20;1040,5;9,3;95;0;0;00;N;16;0 +5-11-2020 12:25;1040,5;9,5;95;0;0;00;N;16;0 +5-11-2020 12:30;1040,5;9,7;94;0;0;00;N;12;1,6 +5-11-2020 12:35;1040,4;9,8;93;0;0;00;N;16;1,6 +5-11-2020 12:40;1040,4;10;92;0;0;00;N;16;0 +5-11-2020 12:45;1040,3;10,1;90;0;0;00;N;6;1,6 +5-11-2020 12:50;1040,3;10,2;89;0;0;00;N;4;3,2 +5-11-2020 12:55;1040,2;10,4;88;0;0;00;N;0;1,6 +5-11-2020 13:00;1040,2;10,6;87;0;0;00;N;13;3,2 +5-11-2020 13:05;1040,2;10,7;86;0;0;00;N;16;3,2 +5-11-2020 13:10;1040,1;10,8;85;0;0;00;N;11;1,6 +5-11-2020 13:15;1040,1;10,9;85;0;0;00;N;11;1,6 +5-11-2020 13:20;1040;11;85;0;0;00;N;11;3,2 +5-11-2020 13:25;1039,9;11,1;85;0;0;00;N;10;1,6 +5-11-2020 13:30;1039,9;11;84;0;0;00;N;10;1,6 +5-11-2020 13:35;1039,8;11;83;0;0;00;N;10;1,6 +5-11-2020 13:40;1039,8;11,1;82;0;0;00;N;7;3,2 +5-11-2020 13:45;1039,8;11,2;82;0;0;00;N;6;1,6 +5-11-2020 13:50;1039,7;11,1;80;0;0;02;NE;16;4,8 +5-11-2020 13:55;1039,6;11,2;79;0;0;00;N;4;3,2 +5-11-2020 14:00;1039,6;11,2;78;0;0;00;N;16;3,2 +5-11-2020 14:05;1039,6;11,2;77;0;0;00;N;6;1,6 +5-11-2020 14:10;1039,5;11,3;77;0;0;00;N;7;1,6 +5-11-2020 14:15;1039,5;11,6;76;0;0;00;N;6;1,6 +5-11-2020 14:20;1039,4;11,5;75;0;0;00;N;16;3,2 +5-11-2020 14:25;1039,3;11,6;75;0;0;00;N;16;1,6 +5-11-2020 14:30;1039,3;11,6;75;0;0;00;N;16;3,2 +5-11-2020 14:35;1039,2;11,5;74;0;0;00;N;16;3,2 +5-11-2020 14:40;1039,1;11,5;74;0;0;00;N;16;3,2 +5-11-2020 14:45;1039;11,4;74;0;0;00;N;16;3,2 +5-11-2020 14:50;1039;11,3;74;0;0;00;N;16;3,2 +5-11-2020 14:55;1039;11,3;75;0;0;00;N;16;3,2 +5-11-2020 15:00;1038,9;11,3;75;0;0;00;N;16;1,6 +5-11-2020 15:05;1038,9;11,2;76;0;0;00;N;16;3,2 +5-11-2020 15:10;1038,9;11,2;77;0;0;00;N;16;3,2 +5-11-2020 15:15;1038,8;11,2;77;0;0;00;N;16;1,6 +5-11-2020 15:20;1038,8;11,1;77;0;0;00;N;3;1,6 +5-11-2020 15:25;1038,7;11,1;78;0;0;00;N;6;1,6 +5-11-2020 15:30;1038,7;11,1;78;0;0;00;N;6;1,6 +5-11-2020 15:35;1038,6;11,1;78;0;0;00;N;6;1,6 +5-11-2020 15:40;1038,6;11;78;0;0;00;N;16;3,2 +5-11-2020 15:45;1038,5;10,9;78;0;0;00;N;6;1,6 +5-11-2020 15:50;1038,5;10,9;79;0;0;00;N;16;1,6 +5-11-2020 15:55;1038,4;10,8;79;0;0;00;N;16;1,6 +5-11-2020 16:00;1038,4;10,7;79;0;0;00;N;6;1,6 +5-11-2020 16:05;1038,4;10,7;79;0;0;00;N;4;3,2 +5-11-2020 16:10;1038,4;10,6;80;0;0;00;N;16;1,6 +5-11-2020 16:15;1038,4;10,6;80;0;0;00;N;6;3,2 +5-11-2020 16:20;1038,3;10,5;80;0;0;00;N;6;1,6 +5-11-2020 16:25;1038,3;10,4;81;0;0;00;N;16;0 +5-11-2020 16:30;1038,2;10,3;81;0;0;00;N;16;0 +5-11-2020 16:35;1038,2;10,2;82;0;0;00;N;16;0 +5-11-2020 16:40;1038,1;10,1;82;0;0;00;N;16;0 +5-11-2020 16:45;1038,1;9,9;82;0;0;00;N;16;0 +5-11-2020 16:50;1038;9,7;83;0;0;00;N;16;0 +5-11-2020 16:55;1038;9,5;83;0;0;00;N;16;0 +5-11-2020 17:00;1037,9;9,3;84;0;0;00;N;16;0 +5-11-2020 17:05;1038;9,2;84;0;0;00;N;16;0 +5-11-2020 17:10;1038;9;85;0;0;00;N;16;0 +5-11-2020 17:15;1038;8,8;85;0;0;00;N;16;0 +5-11-2020 17:20;1038;8,7;86;0;0;00;N;16;0 +5-11-2020 17:25;1038;8,4;86;0;0;00;N;16;0 +5-11-2020 17:30;1038;8,2;86;0;0;00;N;16;0 +5-11-2020 17:35;1038;7,9;86;0;0;00;N;16;0 +5-11-2020 17:40;1038;7,6;86;0;0;00;N;16;0 +5-11-2020 17:45;1038;7,3;87;0;0;00;N;16;0 +5-11-2020 17:50;1038;7,2;87;0;0;00;N;16;0 +5-11-2020 17:55;1037,9;6,9;88;0;0;00;N;16;0 +5-11-2020 18:00;1037,9;6,7;88;0;0;00;N;16;0 +5-11-2020 18:05;1037,9;6,6;88;0;0;00;N;16;0 +5-11-2020 18:10;1037,9;6,2;88;0;0;00;N;16;0 +5-11-2020 18:15;1038;5,9;88;0;0;00;N;16;0 +5-11-2020 18:20;1037,9;5,8;89;0;0;00;N;16;0 +5-11-2020 18:25;1038;5,7;89;0;0;00;N;16;0 +5-11-2020 18:30;1037,9;5,5;90;0;0;00;N;16;0 +5-11-2020 18:35;1037,9;5,3;90;0;0;00;N;16;0 +5-11-2020 18:40;1037,9;5,1;90;0;0;00;N;16;0 +5-11-2020 18:45;1037,9;4,9;90;0;0;00;N;16;0 +5-11-2020 18:50;1037,9;4,7;90;0;0;00;N;16;0 +5-11-2020 18:55;1037,9;4,4;90;0;0;00;N;16;0 +5-11-2020 19:00;1037,9;4,2;90;0;0;00;N;16;0 +5-11-2020 19:05;1037,8;4,2;91;0;0;00;N;16;0 +5-11-2020 19:10;1037,9;4,1;91;0;0;00;N;16;0 +5-11-2020 19:15;1037,9;4,1;91;0;0;00;N;16;0 +5-11-2020 19:20;1038;4;91;0;0;00;N;16;0 +5-11-2020 19:25;1038;3,8;91;0;0;00;N;16;0 +5-11-2020 19:30;1038;3,7;92;0;0;00;N;16;0 +5-11-2020 19:35;1038;3,6;92;0;0;00;N;16;0 +5-11-2020 19:40;1038;3,6;92;0;0;00;N;16;0 +5-11-2020 19:45;1038;3,6;92;0;0;00;N;16;0 +5-11-2020 19:50;1038;3,7;92;0;0;00;N;16;0 +5-11-2020 19:55;1038;3,6;92;0;0;00;N;16;0 +5-11-2020 20:00;1038;3,4;92;0;0;00;N;16;0 +5-11-2020 20:05;1038,1;3,3;92;0;0;00;N;16;0 +5-11-2020 20:10;1038;3,2;92;0;0;00;N;16;0 +5-11-2020 20:15;1038;3,1;93;0;0;00;N;16;0 +5-11-2020 20:20;1038;3,1;93;0;0;00;N;16;0 +5-11-2020 20:25;1037,9;3,1;94;0;0;00;N;16;0 +5-11-2020 20:30;1037,9;3,1;94;0;0;00;N;16;0 +5-11-2020 20:35;1037,9;2,9;94;0;0;00;N;16;0 +5-11-2020 20:40;1037,8;2,8;94;0;0;00;N;16;0 +5-11-2020 20:45;1037,8;2,8;94;0;0;00;N;16;0 +5-11-2020 20:50;1037,8;2,8;94;0;0;00;N;16;0 +5-11-2020 20:55;1037,8;2,8;94;0;0;00;N;16;0 +5-11-2020 21:00;1037,8;2,8;95;0;0;00;N;16;0 +5-11-2020 21:05;1037,8;2,8;95;0;0;00;N;16;0 +5-11-2020 21:10;1037,8;2,7;94;0;0;00;N;16;0 +5-11-2020 21:15;1037,8;2,6;94;0;0;00;N;16;0 +5-11-2020 21:20;1037,8;2,6;94;0;0;00;N;16;0 +5-11-2020 21:25;1037,8;2,5;95;0;0;00;N;16;0 +5-11-2020 21:30;1037,8;2,5;95;0;0;00;N;16;0 +5-11-2020 21:35;1037,7;2,5;95;0;0;00;N;16;0 +5-11-2020 21:40;1037,7;2,4;95;0;0;00;N;16;0 +5-11-2020 21:45;1037,8;2,4;95;0;0;00;N;16;0 +5-11-2020 21:50;1037,8;2,4;95;0;0;00;N;16;0 +5-11-2020 21:55;1037,7;2,4;95;0;0;00;N;16;0 +5-11-2020 22:00;1037,6;2,4;95;0;0;00;N;16;0 +5-11-2020 22:05;1037,7;2,4;95;0;0;00;N;16;0 +5-11-2020 22:10;1037,6;2,3;95;0;0;00;N;16;0 +5-11-2020 22:15;1037,5;2,1;95;0;0;00;N;16;0 +5-11-2020 22:20;1037,6;2;95;0;0;00;N;16;0 +5-11-2020 22:25;1037,5;2;95;0;0;00;N;16;0 +5-11-2020 22:30;1037,5;1,9;95;0;0;00;N;16;0 +5-11-2020 22:35;1037,3;1,9;95;0;0;00;N;16;0 +5-11-2020 22:40;1037,3;1,9;95;0;0;00;N;16;0 +5-11-2020 22:45;1037,2;2;95;0;0;00;N;16;0 +5-11-2020 22:50;1037,1;2,1;96;0;0;00;N;16;0 +5-11-2020 22:55;1037,1;2,2;96;0;0;00;N;16;0 +5-11-2020 23:00;1037;2,1;95;0;0;00;N;16;0 +5-11-2020 23:05;1037;2;95;0;0;00;N;16;0 +5-11-2020 23:10;1037;1,9;95;0;0;00;N;16;0 +5-11-2020 23:15;1036,9;2,1;96;0;0;00;N;16;0 +5-11-2020 23:20;1036,9;2,1;96;0;0;00;N;16;0 +5-11-2020 23:25;1036,9;2,1;96;0;0;00;N;16;0 +5-11-2020 23:30;1036,9;2,1;96;0;0;00;N;16;0 +5-11-2020 23:35;1036,8;2,1;96;0;0;00;N;16;0 +5-11-2020 23:40;1036,8;2;96;0;0;00;N;16;0 +5-11-2020 23:45;1036,7;1,9;96;0;0;00;N;16;0 +5-11-2020 23:50;1036,7;1,8;96;0;0;00;N;16;0 +5-11-2020 23:55;1036,7;1,7;96;0;0;00;N;16;0 +6-11-2020 00:00;1036,6;1,6;96;0;0;00;N;16;0 +6-11-2020 00:05;1036,5;1,5;96;0;0;00;N;16;0 +6-11-2020 00:10;1036,4;1,4;96;0;0;00;N;16;0 +6-11-2020 00:15;1036,5;1,3;96;0;0;00;N;16;0 +6-11-2020 00:20;1036,4;1,4;96;0;0;00;N;16;0 +6-11-2020 00:25;1036,3;1,4;96;0;0;00;N;16;0 +6-11-2020 00:30;1036,3;1,3;96;0;0;00;N;16;0 +6-11-2020 00:35;1036,3;1,2;96;0;0;00;N;16;0 +6-11-2020 00:40;1036,2;1,1;96;0;0;00;N;16;0 +6-11-2020 00:45;1036,2;1;96;0;0;00;N;16;0 +6-11-2020 00:50;1036,2;0,9;96;0;0;00;N;16;0 +6-11-2020 00:55;1036,1;0,8;96;0;0;00;N;16;0 +6-11-2020 01:00;1036,2;0,7;96;0;0;00;N;16;0 +6-11-2020 01:05;1036,2;0,6;96;0;0;00;N;16;0 +6-11-2020 01:10;1036,2;0,6;96;0;0;00;N;16;0 +6-11-2020 01:15;1036,2;0,6;96;0;0;00;N;16;0 +6-11-2020 01:20;1036,1;0,6;97;0;0;00;N;16;0 +6-11-2020 01:25;1036,1;0,7;97;0;0;00;N;16;0 +6-11-2020 01:30;1036,1;0,8;97;0;0;00;N;16;0 +6-11-2020 01:35;1036;0,9;97;0;0;00;N;16;0 +6-11-2020 01:40;1036;0,8;97;0;0;00;N;16;0 +6-11-2020 01:45;1035,9;0,8;97;0;0;00;N;16;0 +6-11-2020 01:50;1035,9;0,8;97;0;0;00;N;16;0 +6-11-2020 01:55;1036;0,7;97;0;0;00;N;16;0 +6-11-2020 02:00;1036;0,7;97;0;0;00;N;16;0 +6-11-2020 02:05;1036;0,6;97;0;0;00;N;16;0 +6-11-2020 02:10;1036;0,6;97;0;0;00;N;16;0 +6-11-2020 02:15;1035,9;0,6;97;0;0;00;N;16;0 +6-11-2020 02:20;1035,9;0,6;97;0;0;00;N;16;0 +6-11-2020 02:25;1035,9;0,6;97;0;0;00;N;16;0 +6-11-2020 02:30;1035,9;0,6;97;0;0;00;N;16;0 +6-11-2020 02:35;1035,9;0,6;97;0;0;00;N;16;0 +6-11-2020 02:40;1035,9;0,5;97;0;0;00;N;16;0 +6-11-2020 02:45;1035,8;0,6;97;0;0;00;N;16;0 +6-11-2020 02:50;1035,9;0,7;97;0;0;00;N;16;0 +6-11-2020 02:55;1035,8;0,8;97;0;0;00;N;16;0 +6-11-2020 03:00;1035,7;0,8;97;0;0;00;N;16;0 +6-11-2020 03:05;1035,7;0,8;97;0;0;00;N;16;0 +6-11-2020 03:10;1035,7;0,8;97;0;0;00;N;16;0 +6-11-2020 03:15;1035,6;0,7;97;0;0;00;N;16;0 +6-11-2020 03:20;1035,4;0,6;97;0;0;00;N;16;0 +6-11-2020 03:25;1035,5;0,7;97;0;0;00;N;16;0 +6-11-2020 03:30;1035,4;0,7;97;0;0;00;N;16;0 +6-11-2020 03:35;1035,4;0,8;97;0;0;00;N;16;0 +6-11-2020 03:40;1035,3;0,8;97;0;0;00;N;16;0 +6-11-2020 03:45;1035,3;0,8;97;0;0;00;N;16;0 +6-11-2020 03:50;1035,2;1;97;0;0;00;N;16;0 +6-11-2020 03:55;1035,2;1,2;97;0;0;00;N;16;0 +6-11-2020 04:00;1035,1;1,2;97;0;0;00;N;16;0 +6-11-2020 04:05;1035,1;1,2;97;0;0;00;N;16;0 +6-11-2020 04:10;1035;1,2;97;0;0;00;N;16;0 +6-11-2020 04:15;1035;1;97;0;0;00;N;16;0 +6-11-2020 04:20;1035;0,9;97;0;0;00;N;16;0 +6-11-2020 04:25;1035;0,8;97;0;0;00;N;16;0 +6-11-2020 04:30;1034,9;0,7;97;0;0;00;N;16;0 +6-11-2020 04:35;1034,8;0,7;97;0;0;00;N;16;0 +6-11-2020 04:40;1034,8;0,7;97;0;0;00;N;16;0 +6-11-2020 04:45;1034,8;0,7;97;0;0;00;N;16;0 +6-11-2020 04:50;1034,8;0,7;97;0;0;00;N;16;0 +6-11-2020 04:55;1034,7;0,7;97;0;0;00;N;16;0 +6-11-2020 05:00;1034,7;0,7;97;0;0;00;N;16;0 +6-11-2020 05:05;1034,6;0,6;97;0;0;00;N;16;0 +6-11-2020 05:10;1034,7;0,7;97;0;0;00;N;16;0 +6-11-2020 05:15;1034,6;0,7;97;0;0;00;N;16;0 +6-11-2020 05:20;1034,6;0,7;97;0;0;00;N;16;0 +6-11-2020 05:25;1034,5;0,7;97;0,2;0;00;N;16;0 +6-11-2020 05:30;1034,6;0,8;97;0;0;00;N;16;0 +6-11-2020 05:35;1034,6;0,7;97;0;0;00;N;16;0 +6-11-2020 05:40;1034,5;0,7;97;0;0;00;N;16;0 +6-11-2020 05:45;1034,5;0,7;97;0;0;00;N;16;0 +6-11-2020 05:50;1034,4;0,7;97;0;0;00;N;16;0 +6-11-2020 05:55;1034,4;0,8;97;0;0;00;N;16;0 +6-11-2020 06:00;1034,4;0,8;97;0;0;00;N;16;0 +6-11-2020 06:05;1034,3;0,8;97;0;0;00;N;16;0 +6-11-2020 06:10;1034,3;0,8;97;0;0;00;N;16;0 +6-11-2020 06:15;1034,3;1;98;0;0;00;N;16;0 +6-11-2020 06:20;1034,3;1,2;98;0;0;00;N;16;0 +6-11-2020 06:25;1034,3;1,3;98;0;0;00;N;16;0 +6-11-2020 06:30;1034,2;1,4;98;0;0;00;N;16;0 +6-11-2020 06:35;1034,2;1,6;98;0;0;00;N;16;0 +6-11-2020 06:40;1034;1,6;98;0;0;00;N;16;0 +6-11-2020 06:45;1034;1,6;98;0;0;00;N;16;0 +6-11-2020 06:50;1034;1,6;98;0;0;00;N;16;0 +6-11-2020 06:55;1034;1,5;98;0;0;00;N;16;0 +6-11-2020 07:00;1033,9;1,4;98;0;0;00;N;16;0 +6-11-2020 07:05;1033,9;1,6;98;0;0;00;N;4;1,6 +6-11-2020 07:10;1033,8;1,6;98;0;0;00;N;16;0 +6-11-2020 07:15;1033,8;1,5;98;0;0;00;N;16;0 +6-11-2020 07:20;1033,7;1,4;98;0;0;00;N;16;0 +6-11-2020 07:25;1033,8;1,4;98;0;0;00;N;16;0 +6-11-2020 07:30;1033,7;1,3;98;0;0;00;N;16;0 +6-11-2020 07:35;1033,6;1,3;98;0;0;00;N;16;0 +6-11-2020 07:40;1033,7;1,2;97;0;0;00;N;16;0 +6-11-2020 07:45;1033,8;1,2;97;0;0;00;N;16;0 +6-11-2020 07:50;1033,7;1,2;98;0;0;00;N;16;0 +6-11-2020 07:55;1033,8;1,2;98;0;0;00;N;16;0 +6-11-2020 08:00;1033,8;1,2;98;0;0;00;N;16;0 +6-11-2020 08:05;1033,8;1,2;98;0;0;00;N;16;0 +6-11-2020 08:10;1033,8;1,1;98;0;0;00;N;16;0 +6-11-2020 08:15;1033,9;1,1;98;0;0;00;N;16;0 +6-11-2020 08:20;1033,8;1,2;98;0;0;00;N;16;0 +6-11-2020 08:25;1033,9;1,3;98;0;0;00;N;16;0 +6-11-2020 08:30;1033,9;1,3;98;0;0;00;N;16;0 +6-11-2020 08:35;1033,8;1,4;98;0;0;00;N;16;0 +6-11-2020 08:40;1033,9;1,6;98;0;0;00;N;16;0 +6-11-2020 08:45;1033,9;1,9;98;0;0;00;N;16;0 +6-11-2020 08:50;1034;2,8;98;0;0;00;N;16;0 +6-11-2020 08:55;1034;3,5;98;0;0;00;N;16;0 +6-11-2020 09:00;1033,9;4,3;99;0;0;00;N;16;0 +6-11-2020 09:05;1033,9;5,2;99;0;0;00;N;16;0 +6-11-2020 09:10;1034;5,7;99;0;0;00;N;16;0 +6-11-2020 09:15;1033,9;5,9;99;0;0;00;N;16;0 +6-11-2020 09:20;1033,9;6,2;99;0;0;00;N;16;0 +6-11-2020 09:25;1033,9;6,4;99;0;0;00;N;16;0 +6-11-2020 09:30;1033,7;6,5;98;0;0;00;N;16;0 +6-11-2020 09:35;1033,7;6,6;98;0;0;00;N;16;0 +6-11-2020 09:40;1033,7;6,7;98;0;0;00;N;16;0 +6-11-2020 09:45;1033,6;7,1;98;0;0;00;N;16;0 +6-11-2020 09:50;1033,5;7,2;98;0;0;00;N;2;1,6 +6-11-2020 09:55;1033,5;7;98;0;0;00;N;2;1,6 +6-11-2020 10:00;1033,4;7,1;98;0;0;00;N;16;0 +6-11-2020 10:05;1033,3;7,3;98;0;0;00;N;16;0 +6-11-2020 10:10;1033,3;7,3;98;0;0;00;N;6;1,6 +6-11-2020 10:15;1033,4;7,5;97;0;0;00;N;16;1,6 +6-11-2020 10:20;1033,4;7,7;97;0;0;00;N;16;0 +6-11-2020 10:25;1033,3;7,8;97;0;0;00;N;6;1,6 +6-11-2020 10:30;1033,3;7,8;96;0;0;00;N;6;1,6 +6-11-2020 10:35;1033,2;8;96;0;0;00;N;10;1,6 +6-11-2020 10:40;1033,3;8,1;94;0;0;00;N;6;3,2 +6-11-2020 10:45;1033,1;8,2;94;0;0;00;N;16;3,2 +6-11-2020 10:50;1033,2;8,4;93;0;0;00;N;16;3,2 +6-11-2020 10:55;1033,1;8,7;91;0;0;00;N;16;1,6 +6-11-2020 11:00;1033,1;8,8;87;0;0;02;NE;4;9,7 +6-11-2020 11:05;1033;9,1;84;0;0;02;NE;16;3,2 +6-11-2020 11:10;1032,9;9,4;80;0;0;02;NE;16;6,4 +6-11-2020 11:15;1032,9;9,6;76;0;0;03;ENE;16;6,4 +6-11-2020 11:20;1032,8;9,8;74;0;0;02;NE;6;6,4 +6-11-2020 11:25;1032,6;9,9;72;0;0;05;SEE;16;11,3 +6-11-2020 11:30;1032,6;10,2;72;0;0;02;NE;6;6,4 +6-11-2020 11:35;1032,6;10,3;71;0;0;03;ENE;16;8 +6-11-2020 11:40;1032,4;10,5;70;0;0;02;NE;6;6,4 +6-11-2020 11:45;1032,3;10,7;69;0;0;02;NE;16;4,8 +6-11-2020 11:50;1032,2;10,7;68;0;0;02;NE;16;6,4 +6-11-2020 11:55;1032,1;10,8;68;0;0;02;NE;16;9,7 +6-11-2020 12:00;1032;10,8;68;0;0;02;NE;16;6,4 +6-11-2020 12:05;1031,8;10,7;68;0;0;02;NE;16;8 +6-11-2020 12:10;1031,8;10,4;68;0;0;00;N;16;3,2 +6-11-2020 12:15;1031,7;10,2;69;0;0;02;NE;16;6,4 +6-11-2020 12:20;1031,7;10;70;0;0;02;NE;16;6,4 +6-11-2020 12:25;1031,5;10;70;0;0;02;NE;6;4,8 +6-11-2020 12:30;1031,4;10,1;71;0;0;02;NE;4;4,8 +6-11-2020 12:35;1031,5;10,2;70;0;0;02;NE;16;9,7 +6-11-2020 12:40;1031,5;10,2;70;0;0;03;ENE;16;8 +6-11-2020 12:45;1031,3;10,3;70;0;0;02;NE;16;6,4 +6-11-2020 12:50;1031,3;10,6;70;0;0;02;NE;16;4,8 +6-11-2020 12:55;1031,1;10,9;69;0;0;02;NE;16;4,8 +6-11-2020 13:00;1031;11;66;0;0;03;ENE;16;9,7 +6-11-2020 13:05;1030,9;11,2;66;0;0;03;ENE;16;6,4 +6-11-2020 13:10;1030,8;11,3;66;0;0;02;NE;16;6,4 +6-11-2020 13:15;1030,6;11,4;67;0;0;02;NE;16;8 +6-11-2020 13:20;1030,5;11,6;67;0;0;03;ENE;16;8 +6-11-2020 13:25;1030,5;11,6;68;0;0;03;ENE;6;6,4 +6-11-2020 13:30;1030,4;11,7;68;0;0;02;NE;16;6,4 +6-11-2020 13:35;1030,4;11,8;65;0;0;03;ENE;16;6,4 +6-11-2020 13:40;1030,3;11,8;65;0;0;03;ENE;6;9,7 +6-11-2020 13:45;1030,3;11,8;65;0;0;03;ENE;16;4,8 +6-11-2020 13:50;1030,2;11,9;65;0;0;02;NE;16;4,8 +6-11-2020 13:55;1030;12,1;65;0;0;03;ENE;16;4,8 +6-11-2020 14:00;1030;12,1;64;0;0;03;ENE;6;9,7 +6-11-2020 14:05;1029,9;12,2;63;0;0;03;ENE;16;4,8 +6-11-2020 14:10;1029,9;12,2;62;0;0;05;SEE;6;8 +6-11-2020 14:15;1029,8;12,2;61;0;0;03;ENE;16;9,7 +6-11-2020 14:20;1029,8;12,2;62;0;0;05;SEE;6;9,7 +6-11-2020 14:25;1029,6;12,2;62;0;0;03;ENE;16;6,4 +6-11-2020 14:30;1029,6;12,3;63;0;0;02;NE;16;4,8 +6-11-2020 14:35;1029,5;12,3;62;0;0;03;ENE;16;8 +6-11-2020 14:40;1029,5;12,3;64;0;0;02;NE;16;3,2 +6-11-2020 14:45;1029,4;12,3;63;0;0;03;ENE;6;6,4 +6-11-2020 14:50;1029,3;12,3;63;0;0;02;NE;16;6,4 +6-11-2020 14:55;1029,1;12,2;63;0;0;03;ENE;16;6,4 +6-11-2020 15:00;1029,1;12,2;64;0;0;03;ENE;16;6,4 +6-11-2020 15:05;1029;12,3;64;0;0;02;NE;4;6,4 +6-11-2020 15:10;1029;12,3;63;0;0;03;ENE;16;6,4 +6-11-2020 15:15;1029;12,3;64;0;0;02;NE;16;4,8 +6-11-2020 15:20;1028,8;12,3;64;0;0;02;NE;16;4,8 +6-11-2020 15:25;1028,7;12,3;64;0;0;02;NE;16;6,4 +6-11-2020 15:30;1028,7;12,3;65;0;0;02;NE;16;3,2 +6-11-2020 15:35;1028,6;12,3;65;0;0;02;NE;4;3,2 +6-11-2020 15:40;1028,6;12,2;65;0;0;02;NE;4;3,2 +6-11-2020 15:45;1028,6;12,2;66;0;0;02;NE;16;3,2 +6-11-2020 15:50;1028,6;12,2;67;0;0;00;N;4;1,6 +6-11-2020 15:55;1028,4;12,1;67;0;0;00;N;6;1,6 +6-11-2020 16:00;1028,3;11,9;67;0;0;00;N;6;3,2 +6-11-2020 16:05;1028,2;11,9;67;0;0;02;NE;16;3,2 +6-11-2020 16:10;1028,1;11,8;68;0;0;02;NE;6;3,2 +6-11-2020 16:15;1028,1;11,7;69;0;0;00;N;6;1,6 +6-11-2020 16:20;1028;11,7;70;0;0;00;N;6;1,6 +6-11-2020 16:25;1027,8;11,5;71;0;0;00;N;16;1,6 +6-11-2020 16:30;1027,8;11,3;71;0;0;00;N;16;1,6 +6-11-2020 16:35;1027,8;11,2;72;0;0;02;NE;16;3,2 +6-11-2020 16:40;1027,8;11;73;0;0;02;NE;16;6,4 +6-11-2020 16:45;1027,7;10,8;73;0;0;00;N;16;3,2 +6-11-2020 16:50;1027,6;10,6;73;0;0;00;N;16;3,2 +6-11-2020 16:55;1027,5;10,4;74;0;0;00;N;6;1,6 +6-11-2020 17:00;1027,5;10,2;74;0;0;00;N;16;3,2 +6-11-2020 17:05;1027,6;10;75;0;0;00;N;16;0 +6-11-2020 17:10;1027,6;9,8;75;0;0;00;N;6;1,6 +6-11-2020 17:15;1027,6;9,6;75;0;0;00;N;16;3,2 +6-11-2020 17:20;1027,5;9,4;76;0;0;00;N;16;1,6 +6-11-2020 17:25;1027,5;9,2;76;0;0;00;N;16;1,6 +6-11-2020 17:30;1027,5;8,9;77;0;0;00;N;4;1,6 +6-11-2020 17:35;1027,4;8,8;77;0;0;00;N;16;0 +6-11-2020 17:40;1027,5;8,7;77;0;0;00;N;4;1,6 +6-11-2020 17:45;1027,4;8,5;78;0;0;00;N;16;0 +6-11-2020 17:50;1027,4;8,3;78;0;0;00;N;16;0 +6-11-2020 17:55;1027,4;8,1;78;0;0;00;N;16;0 +6-11-2020 18:00;1027,4;7,8;78;0;0;00;N;16;0 +6-11-2020 18:05;1027,3;7,6;79;0;0;00;N;16;0 +6-11-2020 18:10;1027,3;7,4;80;0;0;00;N;16;0 +6-11-2020 18:15;1027,4;7,3;80;0;0;00;N;16;0 +6-11-2020 18:20;1027,3;7,1;81;0;0;00;N;16;0 +6-11-2020 18:25;1027,3;6,9;81;0;0;00;N;16;0 +6-11-2020 18:30;1027,1;6,8;82;0;0;00;N;16;0 +6-11-2020 18:35;1027;6,6;82;0;0;00;N;16;0 +6-11-2020 18:40;1027;6,6;83;0;0;00;N;16;0 +6-11-2020 18:45;1026,9;6,5;83;0;0;00;N;16;0 +6-11-2020 18:50;1027;6,4;84;0;0;00;N;16;0 +6-11-2020 18:55;1027;6,5;85;0;0;00;N;16;1,6 +6-11-2020 19:00;1026,9;6,7;85;0;0;00;N;6;1,6 +6-11-2020 19:05;1026,9;6,8;85;0;0;00;N;16;0 +6-11-2020 19:10;1026,8;6,7;84;0;0;00;N;16;0 +6-11-2020 19:15;1026,8;6,6;84;0;0;00;N;16;0 +6-11-2020 19:20;1026,7;6,3;84;0;0;00;N;16;0 +6-11-2020 19:25;1026,8;6,2;84;0;0;00;N;16;0 +6-11-2020 19:30;1026,7;6,1;84;0;0;00;N;16;0 +6-11-2020 19:35;1026,6;5,9;84;0;0;00;N;16;0 +6-11-2020 19:40;1026,5;5,9;85;0;0;00;N;16;0 +6-11-2020 19:45;1026,5;5,9;86;0;0;00;N;16;0 +6-11-2020 19:50;1026,4;5,8;85;0;0;00;N;16;0 +6-11-2020 19:55;1026,4;5,6;85;0;0;00;N;16;0 +6-11-2020 20:00;1026,4;5,3;86;0;0;00;N;16;0 +6-11-2020 20:05;1026,2;5,2;86;0;0;00;N;16;0 +6-11-2020 20:10;1026,1;5,2;87;0;0;00;N;16;0 +6-11-2020 20:15;1026,3;5,2;87;0;0;00;N;16;0 +6-11-2020 20:20;1026,2;5,2;88;0;0;00;N;16;0 +6-11-2020 20:25;1026,2;5,1;88;0;0;00;N;16;0 +6-11-2020 20:30;1026,4;4,9;88;0;0;00;N;16;0 +6-11-2020 20:35;1026,4;4,9;88;0;0;00;N;16;0 +6-11-2020 20:40;1026,3;5,1;89;0;0;00;N;16;0 +6-11-2020 20:45;1026,2;5,2;89;0;0;00;N;6;1,6 +6-11-2020 20:50;1026,1;5,2;89;0;0;00;N;16;0 +6-11-2020 20:55;1026;5,1;89;0;0;00;N;16;0 +6-11-2020 21:00;1025,9;5;89;0;0;00;N;16;0 +6-11-2020 21:05;1025,9;4,9;89;0;0;00;N;6;1,6 +6-11-2020 21:10;1026;4,8;89;0;0;00;N;16;0 +6-11-2020 21:15;1025,9;4,8;89;0;0;00;N;16;0 +6-11-2020 21:20;1025,9;4,8;89;0;0;00;N;16;0 +6-11-2020 21:25;1025,9;4,6;89;0;0;00;N;16;0 +6-11-2020 21:30;1025,9;4,5;90;0;0;00;N;16;0 +6-11-2020 21:35;1026;4,4;90;0;0;00;N;16;0 +6-11-2020 21:40;1025,9;4,5;90;0;0;00;N;6;1,6 +6-11-2020 21:45;1025,7;4,8;91;0;0;00;N;16;3,2 +6-11-2020 21:50;1025,6;5,1;91;0;0;00;N;4;1,6 +6-11-2020 21:55;1025,7;5;90;0;0;00;N;16;0 +6-11-2020 22:00;1025,7;4,9;90;0;0;00;N;16;0 +6-11-2020 22:05;1025,7;4,9;90;0;0;00;N;16;0 +6-11-2020 22:10;1025,6;4,7;90;0;0;00;N;16;0 +6-11-2020 22:15;1025,5;4,7;90;0;0;00;N;16;0 +6-11-2020 22:20;1025,2;4,9;91;0;0;00;N;4;1,6 +6-11-2020 22:25;1025,2;5,2;91;0;0;00;N;16;3,2 +6-11-2020 22:30;1025,4;5,4;90;0;0;00;N;16;1,6 +6-11-2020 22:35;1025,4;5,3;90;0;0;00;N;16;0 +6-11-2020 22:40;1025,4;5,2;89;0;0;00;N;16;0 +6-11-2020 22:45;1025,3;5,1;89;0;0;00;N;16;0 +6-11-2020 22:50;1025,3;4,9;89;0;0;00;N;16;0 +6-11-2020 22:55;1025,3;4,7;88;0;0;00;N;16;0 +6-11-2020 23:00;1025,3;4,4;88;0;0;00;N;16;0 +6-11-2020 23:05;1025,2;4,2;88;0;0;00;N;16;0 +6-11-2020 23:10;1025,2;4,1;89;0;0;00;N;16;0 +6-11-2020 23:15;1025,1;4,2;89;0;0;00;N;16;0 +6-11-2020 23:20;1025;4,2;89;0;0;00;N;16;0 +6-11-2020 23:25;1025;4,2;89;0;0;00;N;16;0 +6-11-2020 23:30;1025,1;4,1;89;0;0;00;N;16;0 +6-11-2020 23:35;1025,1;4,2;90;0;0;00;N;16;0 +6-11-2020 23:40;1025,2;4,2;90;0;0;00;N;16;0 +6-11-2020 23:45;1025,1;4,2;90;0;0;00;N;16;0 +6-11-2020 23:50;1025;4,2;90;0;0;00;N;16;3,2 +6-11-2020 23:55;1024,9;4,4;91;0;0;00;N;6;1,6 +7-11-2020 00:00;1024,9;4,4;90;0;0;00;N;16;0 +7-11-2020 00:05;1025;4,5;90;0;0;00;N;16;0 +7-11-2020 00:10;1024,9;4,6;90;0;0;00;N;16;0 +7-11-2020 00:15;1024,9;4,5;90;0;0;00;N;16;0 +7-11-2020 00:20;1024,8;4,4;90;0;0;00;N;16;0 +7-11-2020 00:25;1024,9;4,3;90;0;0;00;N;16;0 +7-11-2020 00:30;1024,9;4,2;90;0;0;00;N;16;0 +7-11-2020 00:35;1024,8;4,2;90;0;0;00;N;16;0 +7-11-2020 00:40;1024,8;4,1;90;0;0;00;N;16;0 +7-11-2020 00:45;1024,7;4;90;0;0;00;N;16;0 +7-11-2020 00:50;1024,7;4,1;90;0;0;00;N;16;0 +7-11-2020 00:55;1024,7;4,2;91;0;0;00;N;4;1,6 +7-11-2020 01:00;1024,6;4,3;91;0;0;00;N;4;1,6 +7-11-2020 01:05;1024,6;4,3;90;0;0;00;N;16;0 +7-11-2020 01:10;1024,5;4,3;90;0;0;00;N;16;0 +7-11-2020 01:15;1024,5;4,3;90;0;0;00;N;6;1,6 +7-11-2020 01:20;1024,5;4,4;90;0;0;00;N;16;0 +7-11-2020 01:25;1024,4;4,4;90;0;0;00;N;16;0 +7-11-2020 01:30;1024,3;4,3;90;0;0;00;N;16;0 +7-11-2020 01:35;1024,4;4,1;90;0;0;00;N;16;1,6 +7-11-2020 01:40;1024,4;4,1;90;0;0;02;NE;16;1,6 +7-11-2020 01:45;1024,3;4,2;90;0;0;02;NE;16;1,6 +7-11-2020 01:50;1024,3;4,2;91;0;0;02;NE;16;1,6 +7-11-2020 01:55;1024,1;4,3;90;0;0;02;NE;16;1,6 +7-11-2020 02:00;1024,2;4,2;90;0;0;00;N;16;1,6 +7-11-2020 02:05;1024,2;4,2;90;0;0;00;N;16;0 +7-11-2020 02:10;1024,3;4,2;91;0;0;00;N;16;0 +7-11-2020 02:15;1024,2;4,3;91;0;0;00;N;16;0 +7-11-2020 02:20;1024,2;4,3;91;0;0;00;N;16;1,6 +7-11-2020 02:25;1024,2;4,4;91;0;0;00;N;6;1,6 +7-11-2020 02:30;1024,2;4,5;91;0;0;00;N;16;1,6 +7-11-2020 02:35;1024,3;4,6;91;0;0;00;N;16;1,6 +7-11-2020 02:40;1024,2;4,6;91;0;0;00;N;4;1,6 +7-11-2020 02:45;1024,2;4,6;91;0;0;00;N;16;1,6 +7-11-2020 02:50;1024,1;4,5;90;0;0;00;N;16;0 +7-11-2020 02:55;1024,1;4,3;90;0;0;00;N;16;0 +7-11-2020 03:00;1024,1;4,3;90;0;0;00;N;16;0 +7-11-2020 03:05;1024;4,3;91;0;0;00;N;16;0 +7-11-2020 03:10;1024;4,3;91;0;0;00;N;16;0 +7-11-2020 03:15;1024;4,4;91;0;0;00;N;6;1,6 +7-11-2020 03:20;1024;4,6;92;0;0;00;N;6;1,6 +7-11-2020 03:25;1024;4,7;91;0;0;00;N;6;1,6 +7-11-2020 03:30;1024;4,7;91;0;0;00;N;16;1,6 +7-11-2020 03:35;1024;4,6;91;0;0;00;N;16;1,6 +7-11-2020 03:40;1024;4,6;91;0;0;00;N;6;1,6 +7-11-2020 03:45;1023,9;4,5;91;0;0;00;N;16;0 +7-11-2020 03:50;1023,9;4,6;92;0;0;00;N;16;1,6 +7-11-2020 03:55;1023,8;4,7;92;0;0;02;NE;16;1,6 +7-11-2020 04:00;1023,8;4,7;92;0;0;02;NE;16;3,2 +7-11-2020 04:05;1023,7;4,7;92;0;0;00;N;16;1,6 +7-11-2020 04:10;1023,7;4,8;92;0;0;02;NE;16;3,2 +7-11-2020 04:15;1023,6;4,8;92;0;0;00;N;16;1,6 +7-11-2020 04:20;1023,6;4,8;92;0;0;00;N;16;1,6 +7-11-2020 04:25;1023,7;4,8;92;0;0;00;N;16;1,6 +7-11-2020 04:30;1023,6;4,8;92;0;0;00;N;16;1,6 +7-11-2020 04:35;1023,6;4,8;92;0;0;00;N;16;1,6 +7-11-2020 04:40;1023,6;4,8;92;0;0;00;N;16;1,6 +7-11-2020 04:45;1023,6;4,8;92;0;0;00;N;6;1,6 +7-11-2020 04:50;1023,6;4,9;92;0;0;00;N;6;1,6 +7-11-2020 04:55;1023,7;4,9;92;0;0;02;NE;6;3,2 +7-11-2020 05:00;1023,7;4,9;92;0;0;00;N;6;1,6 +7-11-2020 05:05;1023,7;4,9;92;0;0;00;N;16;1,6 +7-11-2020 05:10;1023,6;4,8;92;0;0;00;N;16;1,6 +7-11-2020 05:15;1023,6;4,7;92;0;0;00;N;16;1,6 +7-11-2020 05:20;1023,5;4,6;92;0;0;00;N;16;0 +7-11-2020 05:25;1023,5;4,4;92;0;0;00;N;16;0 +7-11-2020 05:30;1023,3;4,3;92;0;0;00;N;16;0 +7-11-2020 05:35;1023,4;4,2;92;0;0;00;N;16;0 +7-11-2020 05:40;1023,5;4;92;0;0;00;N;16;0 +7-11-2020 05:45;1023,4;3,8;93;0;0;00;N;16;0 +7-11-2020 05:50;1023,3;3,7;93;0;0;00;N;16;0 +7-11-2020 05:55;1023,4;3,5;93;0;0;00;N;16;0 +7-11-2020 06:00;1023,5;3,4;93;0;0;00;N;16;0 +7-11-2020 06:05;1023,4;3,3;93;0;0;00;N;16;0 +7-11-2020 06:10;1023,3;3,6;93;0;0;00;N;16;0 +7-11-2020 06:15;1023,2;3,8;94;0;0;00;N;16;1,6 +7-11-2020 06:20;1023,1;3,9;94;0;0;00;N;16;0 +7-11-2020 06:25;1023;3,8;94;0;0;00;N;16;0 +7-11-2020 06:30;1023;3,9;94;0;0;00;N;16;0 +7-11-2020 06:35;1022,9;4,2;95;0;0;00;N;16;1,6 +7-11-2020 06:40;1023;4,6;95;0;0;02;NE;16;3,2 +7-11-2020 06:45;1022,9;4,8;95;0;0;02;NE;4;3,2 +7-11-2020 06:50;1023;4,8;94;0;0;00;N;4;1,6 +7-11-2020 06:55;1023;4,7;94;0;0;00;N;16;0 +7-11-2020 07:00;1023,1;4,6;94;0;0;00;N;16;0 +7-11-2020 07:05;1023,1;4,3;94;0;0;00;N;16;0 +7-11-2020 07:10;1023,1;4,1;94;0;0;00;N;16;0 +7-11-2020 07:15;1023,1;4,1;94;0;0;00;N;16;0 +7-11-2020 07:20;1023,2;4,2;95;0;0;00;N;16;0 +7-11-2020 07:25;1023,1;4,2;95;0;0;00;N;16;0 +7-11-2020 07:30;1023,2;4,2;95;0;0;00;N;16;0 +7-11-2020 07:35;1023,3;4,2;95;0;0;00;N;16;0 +7-11-2020 07:40;1023,3;4,2;95;0;0;00;N;16;0 +7-11-2020 07:45;1023,4;4,1;95;0;0;00;N;16;0 +7-11-2020 07:50;1023,5;4;95;0;0;00;N;16;0 +7-11-2020 07:55;1023,6;3,9;95;0;0;00;N;16;0 +7-11-2020 08:00;1023,6;3,8;95;0;0;00;N;16;0 +7-11-2020 08:05;1023,7;3,7;95;0;0;00;N;16;0 +7-11-2020 08:10;1023,8;3,7;95;0;0;00;N;16;0 +7-11-2020 08:15;1023,7;3,9;95;0;0;00;N;16;0 +7-11-2020 08:20;1023,7;4,1;95;0;0;00;N;16;0 +7-11-2020 08:25;1023,7;4,3;96;0;0;00;N;16;0 +7-11-2020 08:30;1023,8;4,4;96;0;0;00;N;16;0 +7-11-2020 08:35;1023,7;4,4;95;0;0;00;N;16;0 +7-11-2020 08:40;1023,8;4,6;96;0;0;00;N;16;0 +7-11-2020 08:45;1023,8;4,8;96;0;0;00;N;16;0 +7-11-2020 08:50;1023,8;5,1;96;0;0;00;N;16;0 +7-11-2020 08:55;1023,7;5,4;96;0;0;00;N;16;0 +7-11-2020 09:00;1023,6;5,7;96;0;0;00;N;16;0 +7-11-2020 09:05;1023,5;5,8;96;0;0;00;N;16;0 +7-11-2020 09:10;1023,5;5,9;96;0;0;00;N;4;1,6 +7-11-2020 09:15;1023,5;6,2;96;0;0;00;N;16;0 +7-11-2020 09:20;1023,5;6,6;97;0;0;00;N;16;1,6 +7-11-2020 09:25;1023,5;7,1;97;0;0;00;N;4;3,2 +7-11-2020 09:30;1023,5;7,3;97;0;0;00;N;16;3,2 +7-11-2020 09:35;1023,5;7,7;97;0;0;02;NE;4;3,2 +7-11-2020 09:40;1023,5;8,1;97;0;0;00;N;4;1,6 +7-11-2020 09:45;1023,5;8,5;97;0;0;00;N;16;1,6 +7-11-2020 09:50;1023,5;8,9;97;0;0;00;N;16;3,2 +7-11-2020 09:55;1023,5;9,1;96;0;0;02;NE;16;3,2 +7-11-2020 10:00;1023,5;9,2;95;0;0;02;NE;16;4,8 +7-11-2020 10:05;1023,5;9,3;95;0;0;02;NE;16;6,4 +7-11-2020 10:10;1023,5;9,5;95;0;0;02;NE;4;4,8 +7-11-2020 10:15;1023,4;9,7;94;0;0;03;ENE;16;6,4 +7-11-2020 10:20;1023,3;9,9;94;0;0;03;ENE;16;6,4 +7-11-2020 10:25;1023,3;10,2;93;0;0;03;ENE;16;4,8 +7-11-2020 10:30;1023,3;10,4;93;0;0;02;NE;6;8 +7-11-2020 10:35;1023,3;10,7;92;0;0;03;ENE;16;8 +7-11-2020 10:40;1023,3;10,8;91;0;0;03;ENE;6;8 +7-11-2020 10:45;1023,3;11,1;91;0;0;03;ENE;4;8 +7-11-2020 10:50;1023,3;11,3;90;0;0;03;ENE;6;8 +7-11-2020 10:55;1023,2;11,4;89;0;0;03;ENE;16;8 +7-11-2020 11:00;1023,2;11,6;88;0;0;03;ENE;6;9,7 +7-11-2020 11:05;1023,1;11,8;87;0;0;03;ENE;16;9,7 +7-11-2020 11:10;1023;12;87;0;0;03;ENE;6;9,7 +7-11-2020 11:15;1023;12,2;86;0;0;02;NE;16;6,4 +7-11-2020 11:20;1023;12,3;85;0;0;05;SEE;16;11,3 +7-11-2020 11:25;1023;12,4;85;0;0;05;SEE;6;12,9 +7-11-2020 11:30;1023;12,6;84;0;0;03;ENE;16;11,3 +7-11-2020 11:35;1023;12,7;84;0;0;03;ENE;4;8 +7-11-2020 11:40;1022,9;12,9;84;0;0;02;NE;16;6,4 +7-11-2020 11:45;1022,8;13,1;84;0;0;02;NE;16;4,8 +7-11-2020 11:50;1022,8;13,2;83;0;0;02;NE;16;4,8 +7-11-2020 11:55;1022,7;13,3;83;0;0;02;NE;16;3,2 +7-11-2020 12:00;1022,8;13,4;82;0;0;02;NE;16;6,4 +7-11-2020 12:05;1022,8;13,5;82;0;0;03;ENE;16;9,7 +7-11-2020 12:10;1022,7;13,7;82;0;0;00;N;16;4,8 +7-11-2020 12:15;1022,7;13,8;81;0;0;03;ENE;16;8 +7-11-2020 12:20;1022,6;13,8;81;0;0;03;ENE;16;8 +7-11-2020 12:25;1022,5;14;81;0;0;00;N;16;3,2 +7-11-2020 12:30;1022,6;14,2;81;0;0;02;NE;16;6,4 +7-11-2020 12:35;1022,5;14,4;81;0;0;00;N;6;1,6 +7-11-2020 12:40;1022,5;14,5;80;0;0;02;NE;6;4,8 +7-11-2020 12:45;1022,5;14,5;79;0;0;03;ENE;4;8 +7-11-2020 12:50;1022,5;14,6;79;0;0;02;NE;6;4,8 +7-11-2020 12:55;1022,5;14,7;79;0;0;02;NE;16;6,4 +7-11-2020 13:00;1022,5;14,7;79;0;0;02;NE;16;4,8 +7-11-2020 13:05;1022,4;14,8;78;0;0;02;NE;4;9,7 +7-11-2020 13:10;1022,4;14,8;78;0;0;02;NE;4;9,7 +7-11-2020 13:15;1022,5;15,1;78;0;0;00;N;15;1,6 +7-11-2020 13:20;1022,4;15,2;78;0;0;02;NE;4;3,2 +7-11-2020 13:25;1022,4;15,3;77;0;0;00;N;6;1,6 +7-11-2020 13:30;1022,4;15,3;77;0;0;02;NE;4;6,4 +7-11-2020 13:35;1022,3;15,4;77;0;0;02;NE;16;8 +7-11-2020 13:40;1022,3;15,4;77;0;0;00;N;16;6,4 +7-11-2020 13:45;1022,3;15,5;76;0;0;00;N;16;1,6 +7-11-2020 13:50;1022,1;15,6;76;0;0;00;N;16;1,6 +7-11-2020 13:55;1022,1;15,7;76;0;0;00;N;4;1,6 +7-11-2020 14:00;1022;15,8;76;0;0;00;N;16;3,2 +7-11-2020 14:05;1022;15,8;76;0;0;02;NE;4;4,8 +7-11-2020 14:10;1022;15,8;76;0;0;02;NE;16;4,8 +7-11-2020 14:15;1022;15,8;76;0;0;00;N;4;1,6 +7-11-2020 14:20;1021,9;15,9;76;0;0;00;N;16;0 +7-11-2020 14:25;1021,8;15,8;76;0;0;02;NE;16;4,8 +7-11-2020 14:30;1021,7;15,7;77;0;0;02;NE;16;3,2 +7-11-2020 14:35;1021,6;15,6;77;0;0;02;NE;6;4,8 +7-11-2020 14:40;1021,6;15,6;77;0;0;00;N;4;1,6 +7-11-2020 14:45;1021,6;15,5;77;0;0;00;N;6;3,2 +7-11-2020 14:50;1021,6;15,5;78;0;0;00;N;6;1,6 +7-11-2020 14:55;1021,5;15,6;78;0;0;00;N;6;3,2 +7-11-2020 15:00;1021,5;15,6;78;0;0;00;N;6;1,6 +7-11-2020 15:05;1021,5;15,6;78;0;0;02;NE;16;3,2 +7-11-2020 15:10;1021,4;15,6;78;0;0;00;N;6;1,6 +7-11-2020 15:15;1021,4;15,6;78;0;0;00;N;6;1,6 +7-11-2020 15:20;1021,5;15,7;78;0;0;02;NE;16;3,2 +7-11-2020 15:25;1021,5;15,7;78;0;0;00;N;16;3,2 +7-11-2020 15:30;1021,6;15,6;78;0;0;00;N;16;3,2 +7-11-2020 15:35;1021,4;15,5;78;0;0;00;N;16;1,6 +7-11-2020 15:40;1021,4;15,4;78;0;0;00;N;16;1,6 +7-11-2020 15:45;1021,4;15,2;79;0;0;00;N;16;0 +7-11-2020 15:50;1021,5;15,1;79;0;0;00;N;16;3,2 +7-11-2020 15:55;1021,5;14,9;80;0;0;00;N;16;0 +7-11-2020 16:00;1021,6;14,8;80;0;0;00;N;16;0 +7-11-2020 16:05;1021,7;14,7;81;0;0;00;N;16;1,6 +7-11-2020 16:10;1021,7;14,6;81;0;0;00;N;16;0 +7-11-2020 16:15;1021,7;14,6;82;0;0;00;N;16;1,6 +7-11-2020 16:20;1021,7;14,5;82;0;0;00;N;16;1,6 +7-11-2020 16:25;1021,8;14,4;82;0;0;00;N;16;0 +7-11-2020 16:30;1021,7;14,4;83;0;0;00;N;16;0 +7-11-2020 16:35;1021,7;14,2;83;0;0;00;N;16;0 +7-11-2020 16:40;1021,7;14,1;83;0;0;00;N;16;0 +7-11-2020 16:45;1021,6;13,8;84;0;0;00;N;16;0 +7-11-2020 16:50;1021,5;13,6;84;0;0;00;N;16;0 diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/mkgrad.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/mkgrad.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/mkgrad.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/mkgrad.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,171 @@ +iColors = array_keys($rgb->rgb_table); + usort($this->iColors,'_cmp'); + + $this->iGradstyles = array( + "Vertical",2, + "Horizontal",1, + "Vertical from middle",3, + "Horizontal from middle",4, + "Horizontal wider middle",6, + "Vertical wider middle",7, + "Rectangle",5 ); + } + + function Run() { + + echo '

Generate gradient background

'; + echo '
'; + echo ''; + echo "\n"; + echo ''; + echo "\n"; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
Width:
'.$this->GenHTMLInput('w',8,4,300).'
Height:
'.$this->GenHTMLInput('h',8,4,300).'
From Color:
'; + echo $this->GenHTMLSelect('fc',$this->iColors); + echo '
To Color:
'; + echo $this->GenHTMLSelect('tc',$this->iColors); + echo '
Gradient style:
'; + echo $this->GenHTMLSelectCode('s',$this->iGradstyles); + echo '
Filename: (empty to stream)
'; + echo $this->GenHTMLInput('fn',55,100); + echo '
'.$this->GenHTMLSubmit('submit').'
'; + echo '
'; + + } + + function GenHTMLSubmit($name) { + return ''; + } + + + function GenHTMLInput($name,$len,$maxlen=100,$val='') { + return ''; + } + + function GenHTMLSelect($name,$option,$selected="",$size=0) { + $txt="\n"; + } + + function GenHTMLSelectCode($name,$option,$selected="",$size=0) { + $txt="\n"; + } + +} + +// Basic application driver + +class Driver { + var $iGraph, $iGrad; + var $iWidth,$iHeight; + var $iFromColor, $iToColor; + var $iStyle; + var $iForm; + + function Driver() { + $this->iForm = new Form(); + } + + function GenGradImage() { + + $aWidth = (int)@$_POST['w']; + $aHeight = (int)@$_POST['h']; + $aFrom = @$_POST['fc']; + $aTo = @$_POST['tc']; + $aStyle = @$_POST['s']; + $aFileName = @$_POST['fn']; + + $this->iWidth = $aWidth; + $this->iHeight = $aHeight; + $this->iFromColor = $aFrom; + $this->iToColor = $aTo; + $this->iStyle = $aStyle; + + $this->graph = new CanvasGraph($aWidth,$aHeight); + $this->grad = new Gradient($this->graph->img); + $this->grad->FilledRectangle(0,0, + $this->iWidth,$this->iHeight, + $this->iFromColor, + $this->iToColor, + $this->iStyle); + + if( $aFileName != "" ) { + $this->graph->Stroke($aFileName); + echo "Image file '$aFileName' created."; + } + else + $this->graph->Stroke(); + } + + + function Run() { + + global $HTTP_POST_VARS; + + // Two modes: + // 1) If the script is called with no posted arguments + // we show the input form. + // 2) If we have posted arguments we naivly assume that + // we are called to do the image. + + if( @$_POST['ok']===' Ok ' ) { + $this->GenGradImage(); + } + else + $this->iForm->Run(); + } +} + +$driver = new Driver(); +$driver->Run(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/multconstganttex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/multconstganttex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/multconstganttex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/multconstganttex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +title->Set("Example with multiple constrains"); + +$bar1 = new GanttBar(0, "Label 1", "2003-06-08", "2003-06-12"); +$bar2 = new GanttBar(1, "Label 2", "2003-06-16", "2003-06-19"); +$bar3 = new GanttBar(2, "Label 3", "2003-06-15", "2003-06-21"); + +//create constraints +$bar1->SetConstrain(1, CONSTRAIN_ENDSTART); +$bar1->SetConstrain(2, CONSTRAIN_ENDSTART); + +// Setup scale +$graph->ShowHeaders(/*GANTT_HYEAR | GANTT_HMONTH |*/ GANTT_HDAY | GANTT_HWEEK); +$graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAYWNBR); + +// Add the specified activities +$graph->Add($bar1); +$graph->Add($bar2); +$graph->Add($bar3); + +// .. and stroke the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/mulyaxiscsimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/mulyaxiscsimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/mulyaxiscsimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/mulyaxiscsimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,75 @@ +SetMargin(60,180,50,40); +$graph->SetMarginColor('white'); +$graph->title->Set("Multi Y-axes with Image Map"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Setup the scales for all axes +$graph->SetScale("intlin"); +$graph->SetYScale(0,'int'); +$graph->SetYScale(1,'int'); + +// Standard Y-axis plot +$lp1 = new LinePlot($datay1); +$lp1->SetLegend('2001'); +$lp1->mark->SetType(MARK_DIAMOND); +$lp1->mark->SetWidth(15); +$lp1->mark->SetFillColor('orange'); +$lp1->SetCSIMTargets($targ1,$alts1); +$graph->yaxis->title->Set('Basic Rate'); +$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->yaxis->title->SetColor('black'); +$graph->Add($lp1); + +// First multi Y-axis plot +$lp2 = new LinePlot($datay2); +$lp2->SetLegend('2002'); +$lp2->mark->SetType(MARK_DIAMOND); +$lp2->mark->SetWidth(15); +$lp2->mark->SetFillColor('darkred'); +$lp2->SetCSIMTargets($targ2,$alts2); +$graph->ynaxis[0]->SetColor('darkred'); +$graph->ynaxis[0]->title->Set('Rate A'); +$graph->ynaxis[0]->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->ynaxis[0]->title->SetColor('darkred'); +$graph->AddY(0,$lp2); + +// Second multi Y-axis plot +$lp3 = new LinePlot($datay3); +$lp3->SetLegend('2003'); +$lp3->mark->SetType(MARK_DIAMOND); +$lp3->mark->SetWidth(15); +$lp3->mark->SetFillColor('darkgreen'); +$lp3->SetCSIMTargets($targ3,$alts3); +$graph->ynaxis[1]->SetColor('darkgreen'); +$graph->ynaxis[1]->title->Set('Rate B'); +$graph->ynaxis[1]->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->ynaxis[1]->title->SetColor('darkgreen'); +$graph->AddY(1,$lp3); + +// Send back the HTML page which will call this script again +// to retrieve the image. +$graph->StrokeCSIM(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/mulyaxisex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/mulyaxisex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/mulyaxisex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/mulyaxisex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,47 @@ +clearTheme(); +$graph->SetMargin(40,150,40,30); +$graph->SetMarginColor('white'); + +$graph->SetScale('intlin'); +$graph->title->Set('Using multiple Y-axis'); +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,14); + +$graph->SetYScale(0,'lin'); +$graph->SetYScale(1,'lin'); +$graph->SetYScale(2,'lin'); + +$p1 = new LinePlot($datay); +$graph->Add($p1); + +$p2 = new LinePlot($datay2); +$p2->SetColor('teal'); +$graph->AddY(0,$p2); +$graph->ynaxis[0]->SetColor('teal'); + +$p3 = new LinePlot($datay3); +$p3->SetColor('red'); +$graph->AddY(1,$p3); +$graph->ynaxis[1]->SetColor('red'); + +$p4 = new LinePlot($datay4); +$p4->SetColor('blue'); +$graph->AddY(2,$p4); +$graph->ynaxis[2]->SetColor('blue'); + +// Output line +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/negbarvalueex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/negbarvalueex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/negbarvalueex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/negbarvalueex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +clearTheme(); +$graph->img->SetMargin(60,30,40,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); + +// DIsplay value at top of each bar +$bplot->value->Show(); +$bplot->SetShadow(); + +$graph->Add($bplot); + +// Position the scale at the min of the other axis +$graph->xaxis->SetPos("min"); + +// Add 10% more space at top and bottom of graph +$graph->yscale->SetGrace(10,10); + +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->title->SetFont(FF_VERDANA,FS_NORMAL,12); +$graph->title->Set("Example of bar plot with absolute labels"); + +$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,16); + + +$graph->Stroke(); +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new1.gif and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new1.gif differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new2.gif and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new2.gif differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +SetScale("textlin"); + +$theme_class=new UniversalTheme; +$graph->SetTheme($theme_class); + +$graph->yaxis->SetTickPositions(array(0,30,60,90,120,150), array(15,45,75,105,135)); +$graph->SetBox(false); + +$graph->ygrid->SetFill(false); +$graph->xaxis->SetTickLabels(array('A','B','C','D')); +$graph->yaxis->HideLine(false); +$graph->yaxis->HideTicks(false,false); + +// Create the bar plots +$b1plot = new BarPlot($data1y); +$b2plot = new BarPlot($data2y); +$b3plot = new BarPlot($data3y); + +// Create the grouped bar plot +$gbplot = new GroupBarPlot(array($b1plot,$b2plot,$b3plot)); +// ...and add it to the graPH +$graph->Add($gbplot); + + +$b1plot->SetColor("white"); +$b1plot->SetFillColor("#cc1111"); + +$b2plot->SetColor("white"); +$b2plot->SetFillColor("#11cccc"); + +$b3plot->SetColor("white"); +$b3plot->SetFillColor("#1111cc"); + +$graph->title->Set("Bar Plots"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +SetScale("textlin"); + +//$theme_class="DefaultTheme"; +//$graph->SetTheme(new $theme_class()); + +// set major and minor tick positions manually +$graph->yaxis->SetTickPositions(array(0,30,60,90,120,150), array(15,45,75,105,135)); +$graph->SetBox(false); + +//$graph->ygrid->SetColor('gray'); +$graph->ygrid->SetFill(false); +$graph->xaxis->SetTickLabels(array('A','B','C','D')); +$graph->yaxis->HideLine(false); +$graph->yaxis->HideTicks(false,false); + +// Create the bar plots +$b1plot = new BarPlot($datay); + +// ...and add it to the graPH +$graph->Add($b1plot); + + +$b1plot->SetColor("white"); +$b1plot->SetFillGradient("#4B0082","white",GRAD_LEFT_REFLECTION); +$b1plot->SetWidth(45); +$graph->title->Set("Bar Gradient(Left reflection)"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,43 @@ +SetScale("textlin"); + +$theme_class=new UniversalTheme; +$graph->SetTheme($theme_class); + +$graph->Set90AndMargin(50,40,40,40); +$graph->img->SetAngle(90); + +// set major and minor tick positions manually +$graph->SetBox(false); + +//$graph->ygrid->SetColor('gray'); +$graph->ygrid->Show(false); +$graph->ygrid->SetFill(false); +$graph->xaxis->SetTickLabels(array('A','B','C','D','E','F')); +$graph->yaxis->HideLine(false); +$graph->yaxis->HideTicks(false,false); + +// For background to be gradient, setfill is needed first. +$graph->SetBackgroundGradient('#00CED1', '#FFFFFF', GRAD_HOR, BGRAD_PLOT); + +// Create the bar plots +$b1plot = new BarPlot($datay); + +// ...and add it to the graPH +$graph->Add($b1plot); + +$b1plot->SetWeight(0); +$b1plot->SetFillGradient("#808000","#90EE90",GRAD_HOR); +$b1plot->SetWidth(17); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_bar6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,103 @@ +SetScale("textlin"); +$graph->SetY2Scale("lin",0,90); +$graph->SetY2OrderBack(false); + +$graph->SetMargin(35,50,20,5); + +$theme_class = new UniversalTheme; +$graph->SetTheme($theme_class); + +$graph->yaxis->SetTickPositions(array(0,50,100,150,200,250,300,350), array(25,75,125,175,275,325)); +$graph->y2axis->SetTickPositions(array(30,40,50,60,70,80,90)); + +$months = $gDateLocale->GetShortMonth(); +$months = array_merge(array_slice($months,3,9), array_slice($months,0,3)); +$graph->SetBox(false); + +$graph->ygrid->SetFill(false); +$graph->xaxis->SetTickLabels(array('A','B','C','D')); +$graph->yaxis->HideLine(false); +$graph->yaxis->HideTicks(false,false); +// Setup month as labels on the X-axis +$graph->xaxis->SetTickLabels($months); + +// Create the bar plots +$b1plot = new BarPlot($data1y); +$b2plot = new BarPlot($data2y); + +$b3plot = new BarPlot($data3y); +$b4plot = new BarPlot($data4y); +$b5plot = new BarPlot($data5y); + +$lplot = new LinePlot($data6y); + +// Create the grouped bar plot +$gbbplot = new AccBarPlot(array($b3plot,$b4plot,$b5plot)); +$gbplot = new GroupBarPlot(array($b1plot,$b2plot,$gbbplot)); + +// ...and add it to the graPH +$graph->Add($gbplot); +$graph->AddY2($lplot); + +$b1plot->SetColor("#0000CD"); +$b1plot->SetFillColor("#0000CD"); +$b1plot->SetLegend("Cliants"); + +$b2plot->SetColor("#B0C4DE"); +$b2plot->SetFillColor("#B0C4DE"); +$b2plot->SetLegend("Machines"); + +$b3plot->SetColor("#8B008B"); +$b3plot->SetFillColor("#8B008B"); +$b3plot->SetLegend("First Track"); + +$b4plot->SetColor("#DA70D6"); +$b4plot->SetFillColor("#DA70D6"); +$b4plot->SetLegend("All"); + +$b5plot->SetColor("#9370DB"); +$b5plot->SetFillColor("#9370DB"); +$b5plot->SetLegend("Single Only"); + +$lplot->SetBarCenter(); +$lplot->SetColor("yellow"); +$lplot->SetLegend("Houses"); +$lplot->mark->SetType(MARK_X,'',1.0); +$lplot->mark->SetWeight(2); +$lplot->mark->SetWidth(8); +$lplot->mark->setColor("yellow"); +$lplot->mark->setFillColor("yellow"); + +$graph->legend->SetFrameWeight(1); +$graph->legend->SetColumns(6); +$graph->legend->SetColor('#4E4E4E','#00A78A'); + +$band = new PlotBand(VERTICAL,BAND_RDIAG,11,"max",'khaki4'); +$band->ShowFrame(true); +$band->SetOrder(DEPTH_BACK); +$graph->Add($band); + +$graph->title->Set("Combined Line and Bar plots"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_line1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_line1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_line1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_line1.php 2020-09-09 09:18:20.000000000 +0100 @@ -0,0 +1,57 @@ +SetScale("textlin"); + +$theme_class=new UniversalTheme; + +$graph->SetTheme($theme_class); +$graph->img->SetAntiAliasing(false); +$graph->title->Set('Filled Y-grid'); +$graph->SetBox(false); + +$graph->img->SetAntiAliasing(); + +$graph->yaxis->HideZeroLabel(); +$graph->yaxis->HideLine(false); +$graph->yaxis->HideTicks(false,false); + +$graph->xgrid->Show(); +$graph->xgrid->SetLineStyle("solid"); +$graph->xaxis->SetTickLabels(array('A','B','C','D')); +$graph->xgrid->SetColor('#E3E3E3'); +/* $graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLPLOT); */ + +// Create the first line +$p1 = new LinePlot($datay1); +$graph->Add($p1); +$p1->SetColor("#6495ED"); +$p1->SetLegend('Line 1'); + +// Create the second line +$p2 = new LinePlot($datay2); +$graph->Add($p2); +$p2->SetColor("#B22222"); +$p2->SetLegend('Line 2'); + +// Create the third line +$p3 = new LinePlot($datay3); +$graph->Add($p3); +$p3->SetColor("#FF1493"); +$p3->SetLegend('Line 3'); + +$graph->legend->SetFrameWeight(1); + +// Output line +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_line2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_line2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_line2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_line2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,57 @@ +SetScale("textlin"); + +$theme_class= new UniversalTheme; +$graph->SetTheme($theme_class); + +$graph->title->Set('Background Image'); +$graph->SetBox(false); + +$graph->yaxis->HideZeroLabel(); +$graph->yaxis->HideLine(false); +$graph->yaxis->HideTicks(false,false); + +$graph->xaxis->SetTickLabels(array('A','B','C','D')); +$graph->ygrid->SetFill(false); +$graph->SetBackgroundImage("tiger_bkg.png",BGIMG_FILLFRAME); + +$p1 = new LinePlot($datay1); +$graph->Add($p1); + +$p2 = new LinePlot($datay2); +$graph->Add($p2); + +$p1->SetColor("#55bbdd"); +$p1->SetLegend('Line 1'); +$p1->mark->SetType(MARK_FILLEDCIRCLE,'',1.0); +$p1->mark->SetColor('#55bbdd'); +$p1->mark->SetFillColor('#55bbdd'); +$p1->SetCenter(); + +$p2->SetColor("#aaaaaa"); +$p2->SetLegend('Line 2'); +$p2->mark->SetType(MARK_UTRIANGLE,'',1.0); +$p2->mark->SetColor('#aaaaaa'); +$p2->mark->SetFillColor('#aaaaaa'); +$p2->value->SetMargin(14); +$p2->SetCenter(); + +$graph->legend->SetFrameWeight(1); +$graph->legend->SetColor('#4E4E4E','#00A78A'); +$graph->legend->SetMarkAbsSize(8); + + +// Output line +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_line3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_line3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_line3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_line3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +SetScale("textlin",0,50); + +//$theme_class=new DefaultTheme; +//$graph->SetTheme($theme_class); + +$graph->title->Set("Filled Area"); + +$graph->SetBox(false); +$graph->yaxis->HideLine(false); +$graph->yaxis->HideTicks(false,false); +$graph->yaxis->HideZeroLabel(); + +$graph->xaxis->SetTickLabels(array('A','B','C','D','E','F','G')); + +// Create the plot +$p1 = new LinePlot($datay1); +$graph->Add($p1); + +$p2 = new LinePlot($datay2); +$graph->Add($p2); + +// Use an image of favourite car as marker +$p1->mark->SetType(MARK_IMG,'rose.gif',1.0); +$p1->SetLegend('rose'); +$p1->SetColor('#CD5C5C'); + +$p2->mark->SetType(MARK_IMG,'sunflower.gif',1.0); +$p2->SetLegend('sunflower'); +$p2->SetColor('#CD5C5C'); + +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_line4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_line4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_line4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_line4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +SetScale("textlin",0,50); + +$theme_class= new UniversalTheme; +$graph->SetTheme($theme_class); + +$graph->title->Set("Line Plots with Markers"); + +$graph->SetBox(false); +$graph->ygrid->SetFill(false); +$graph->yaxis->HideLine(false); +$graph->yaxis->HideTicks(false,false); +$graph->yaxis->HideZeroLabel(); + +$graph->xaxis->SetTickLabels(array('A','B','C','D','E','F','G')); +// Create the plot +$p1 = new LinePlot($datay1); +$graph->Add($p1); + +$p2 = new LinePlot($datay2); +$graph->Add($p2); + +// Use an image of favourite car as marker +$p1->mark->SetType(MARK_IMG,'new1.gif',0.8); +$p1->SetColor('#aadddd'); +$p1->value->SetFormat('%d'); +$p1->value->Show(); +$p1->value->SetColor('#55bbdd'); + +$p2->mark->SetType(MARK_IMG,'new2.gif',0.8); +$p2->SetColor('#ddaa99'); +$p2->value->SetFormat('%d'); +$p2->value->Show(); +$p2->value->SetColor('#55bbdd'); + + +$graph->Stroke(); + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_line5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_line5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_line5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_line5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,44 @@ +SetScale("intlin",0,$aYMax=50); + +$theme_class= new UniversalTheme; +$graph->SetTheme($theme_class); + +$graph->SetMargin(40,40,50,40); + +$graph->title->Set('Inverted Y-axis'); +$graph->SetBox(false); +$graph->yaxis->HideLine(false); +$graph->yaxis->HideTicks(false,false); + +// For background to be gradient, setfill is needed first. +$graph->ygrid->SetFill(true,'#FFFFFF@0.5','#FFFFFF@0.5'); +$graph->SetBackgroundGradient('#FFFFFF', '#00FF7F', GRAD_HOR, BGRAD_PLOT); + +$graph->xaxis->SetTickLabels(array('G','F','E','D','C','B','A')); +$graph->xaxis->SetLabelMargin(20); +$graph->yaxis->SetLabelMargin(20); + +$graph->SetAxisStyle(AXSTYLE_BOXOUT); +$graph->img->SetAngle(180); + +// Create the line +$p1 = new LinePlot($datay); +$graph->Add($p1); + +$p1->SetFillGradient('#FFFFFF','#F0F8FF'); +$p1->SetColor('#aadddd'); + +// Output line +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,28 @@ +SetTheme(new $theme_class()); + +// Set A title for the plot +$graph->title->Set("A Simple Pie Plot"); +$graph->SetBox(true); + +// Create +$p1 = new PiePlot($data); +$graph->Add($p1); + +$p1->ShowBorder(); +$p1->SetColor('black'); +$p1->SetSliceColors(array('#1E90FF','#2E8B57','#ADFF2F','#DC143C','#BA55D3')); +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,55 @@ +SetShadow(); + +$theme_class= new UniversalTheme; +//$graph->SetTheme($theme_class); + +// Set A title for the plot +$graph->title->Set("Multiple - Pie plot"); + +// Create plots +$size=0.13; +$p1 = new PiePlot($data); +$graph->Add($p1); + +$p1->SetSize($size); +$p1->SetCenter(0.25,0.32); +$p1->SetSliceColors(array('#1E90FF','#2E8B57','#ADFF2F','#DC143C','#BA55D3')); +$p1->title->Set("2005"); + +$p2 = new PiePlot($data); +$graph->Add($p2); + +$p2->SetSize($size); +$p2->SetCenter(0.65,0.32); +$p2->SetSliceColors(array('#1E90FF','#2E8B57','#ADFF2F','#DC143C','#BA55D3')); +$p2->title->Set("2006"); + +$p3 = new PiePlot($data); +$graph->Add($p3); + +$p3->SetSize($size); +$p3->SetCenter(0.25,0.75); +$p3->SetSliceColors(array('#6495ED','#2E8B57','#ADFF2F','#DC143C','#BA55D3')); +$p3->title->Set("2007"); + +$p4 = new PiePlot($data); +$graph->Add($p4); + +$p4->SetSize($size); +$p4->SetCenter(0.65,0.75); +$p4->SetSliceColors(array('#6495ED','#2E8B57','#ADFF2F','#DC143C','#BA55D3')); +$p4->title->Set("2008"); + + +$graph->Stroke(); + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,28 @@ +SetTheme($theme_class); + +// Set A title for the plot +$graph->title->Set("A Simple 3D Pie Plot"); + +// Create +$p1 = new PiePlot3D($data); +$graph->Add($p1); + +$p1->ShowBorder(); +$p1->SetColor('black'); +$p1->SetSliceColors(array('#1E90FF','#2E8B57','#ADFF2F','#BA55D3')); +$p1->ExplodeSlice(1); +$graph->Stroke(); + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_pie4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,65 @@ +SetTheme(new $theme_class()); + +// Setup background +$graph->SetBackgroundImage('worldmap1.jpg',BGIMG_FILLFRAME); + +// Setup title +$graph->title->Set("Pie plots with background image"); +$graph->title->SetColor('white'); +$graph->SetTitleBackground('#4169E1',TITLEBKG_STYLE2,TITLEBKG_FRAME_FULL,'#4169E1',10,10,true); + +$p = array(); +// Create the plots +for( $i=0; $i < $n; ++$i ) { + $p[] = new PiePlot3D($data); +} +for( $i=0; $i < $n; ++$i ) { + $graph->Add($p[$i]); +} + +// Position the four pies and change color +for( $i=0; $i < $n; ++$i ) { + $p[$i]->SetCenter($piepos[2*$i],$piepos[2*$i+1]); + $p[$i]->SetSliceColors(array('#1E90FF','#2E8B57','#ADFF2F','#DC143C','#BA55D3')); +} + +// Set the titles +for( $i=0; $i < $n; ++$i ) { + $p[$i]->title->Set($titles[$i]); + #$p[$i]->title->SetFont(FF_ARIAL,FS_NORMAL,8); +} + +for( $i=0; $i < $n; ++$i ) { + $p[$i]->value->Show(false); +} + +// Size of pie in fraction of the width of the graph +for( $i=0; $i < $n; ++$i ) { + $p[$i]->SetSize(0.13); +} + +for( $i=0; $i < $n; ++$i ) { + $p[$i]->SetEdge(false); + $p[$i]->ExplodeSlice(1,7); +} + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_step1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_step1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/new_step1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/new_step1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +SetScale("intlin",0,$aYMax=50); +$theme_class=new UniversalTheme; +$graph->SetTheme($theme_class); + +$graph->SetBox(false); + +$graph->title->Set('Step Line'); +$graph->ygrid->Show(true); +$graph->xgrid->Show(false); +$graph->yaxis->HideZeroLabel(); +$graph->ygrid->SetFill(true,'#FFFFFF@0.5','#FFFFFF@0.5'); +$graph->SetBackgroundGradient('blue', '#55eeff', GRAD_HOR, BGRAD_PLOT); +$graph->xaxis->SetTickLabels(array('A','B','C','D','E','F','G')); + +// Create the line +$p1 = new LinePlot($datay); +$graph->Add($p1); + +$p1->SetFillGradient('yellow','red'); +$p1->SetStepStyle(); +$p1->SetColor('#808000'); + +// Output line +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/nullvalueex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/nullvalueex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/nullvalueex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/nullvalueex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,55 @@ +clearTheme(); +$graph->img->SetMargin(40,150,40,80); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +//Setup title +$graph->title->Set("Line plot with null values"); + +// Use built in font +$graph->title->SetFont(FF_ARIAL,FS_NORMAL,14); + +// Slightly adjust the legend from it's default position +$graph->legend->Pos(0.03,0.5,"right","center"); +$graph->legend->SetFont(FF_FONT1,FS_BOLD); + +// Setup X-scale +$graph->xaxis->SetTickLabels($datax); +$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,8); +$graph->xaxis->SetLabelAngle(45); + +// Create the first line +$p1 = new LinePlot($datay); +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); +$p1->SetColor("blue"); +$p1->SetCenter(); +$p1->SetLegend("Undefined\nvariant 1"); +$graph->Add($p1); + +// ... and the second +$p2 = new LinePlot($data2y); +$p2->mark->SetType(MARK_STAR); +$p2->mark->SetFillColor("red"); +$p2->mark->SetWidth(4); +$p2->SetColor("red"); +$p2->SetCenter(); +$p2->SetLegend("Undefined\nvariant 2"); +$graph->Add($p2); + +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ocean_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ocean_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/ocean_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/ocean_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ + array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ), + 1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ), + 2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ), + 3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ), + 4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ), + 5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ), + 6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ), + 7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ), + 8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ), +); + + +// Create the graph. These two calls are always required +$graph = new Graph(400,300); + +$graph->SetScale("textlin"); +if ($theme) { + $graph->SetTheme(new $theme()); +} +$theme_class = new OceanTheme; +$graph->SetTheme($theme_class); + +$plot = array(); +// Create the bar plots +for ($i = 0; $i < 4; $i++) { + $plot[$i] = new BarPlot($data[$i]); + $plot[$i]->SetLegend('plot'.($i+1)); +} +//$acc1 = new AccBarPlot(array($plot[0], $plot[1])); +//$acc1->value->Show(); +$gbplot = new GroupBarPlot(array($plot[2], $plot[1] )); + +for ($i = 4; $i < 8; $i++) { + $plot[$i] = new LinePlot($data[$i]); + $plot[$i]->SetLegend('plot'.$i); + $plot[$i]->value->Show(); +} + +$graph->Add($gbplot); +$graph->Add($plot[4]); + +$title = "OceanTheme Example"; +$title = mb_convert_encoding($title,'UTF-8'); +$graph->title->Set($title); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex00.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex00.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex00.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex00.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,47 @@ +SetColor('white'); +$graph->SetMarginColor('white'); +$graph->SetFrame(false); + +//--------------------------------------------------------------------- +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +//--------------------------------------------------------------------- +$odo = new Odometer(); + +//--------------------------------------------------------------------- +// Set display value for the odometer +//--------------------------------------------------------------------- +$odo->needle->Set(40); + +//--------------------------------------------------------------------- +// Add the odometer to the graph +//--------------------------------------------------------------------- +$graph->Add($odo); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex010.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex010.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex010.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex010.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,75 @@ +AddIndication(80,100,"red"); +$odo2->AddIndication(20,30,"green"); +$odo2->AddIndication(65,100,"red"); +$odo3->AddIndication(60,90,"yellow"); +$odo3->AddIndication(90,100,"red"); + +//--------------------------------------------------------------------- +// Set display values for the odometers +//--------------------------------------------------------------------- +$odo1->needle->Set(17); +$odo2->needle->Set(47); +$odo3->needle->Set(86); + +$odo1->needle->SetFillColor("blue"); +$odo2->needle->SetFillColor("yellow:0.7"); +$odo3->needle->SetFillColor("black"); +$odo3->needle->SetColor("black"); + + +//--------------------------------------------------------------------- +// Set scale label properties +//--------------------------------------------------------------------- +$odo1->scale->label->SetColor("navy"); +$odo2->scale->label->SetColor("blue"); +$odo3->scale->label->SetColor("darkred"); + +$odo1->scale->label->SetFont(FF_FONT1); +$odo2->scale->label->SetFont(FF_FONT2,FS_BOLD); +$odo3->scale->label->SetFont(FF_ARIAL,FS_BOLD,11); + +//--------------------------------------------------------------------- +// Add the odometers to the graph using a vertical layout +//--------------------------------------------------------------------- +$l1 = new LayoutVert( array($odo1,$odo2,$odo3) ) ; +$graph->Add( $l1 ); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex011.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex011.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex011.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex011.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,108 @@ +SetShadow(); + +//--------------------------------------------------------------------- +// Specify title and subtitle using default fonts +// * Note each title may be multilines by using a '\n' as a line +// divider. +//--------------------------------------------------------------------- +$graph->title->Set("Result from 2002"); +$graph->title->SetColor("white"); +$graph->subtitle->Set("O1 - W-Site"); +$graph->subtitle->SetColor("white"); + +//--------------------------------------------------------------------- +// Specify caption. +// * (This is the text at the bottom of the graph.) The margins will +// automatically adjust to fit the height of the text. A caption +// may have multiple lines by including a '\n' character in the +// string. +//--------------------------------------------------------------------- +$graph->caption->Set("Fig1. Values within 85%\nconfidence intervall"); +$graph->caption->SetColor("white"); + +//--------------------------------------------------------------------- +// We will display three odometers stacked vertically +// The first thing to do is to create them +//--------------------------------------------------------------------- +$odo1 = new Odometer(); +$odo2 = new Odometer(); +$odo3 = new Odometer(); + + +//--------------------------------------------------------------------- +// Set caption for each odometer +//--------------------------------------------------------------------- +$odo1->caption->Set("April"); +$odo1->caption->SetFont(FF_FONT2,FS_BOLD); +$odo2->caption->Set("May"); +$odo2->caption->SetFont(FF_FONT2,FS_BOLD); +$odo3->caption->Set("June"); +$odo3->caption->SetFont(FF_FONT2,FS_BOLD); + +//--------------------------------------------------------------------- +// Set Indicator bands for the odometers +//--------------------------------------------------------------------- +$odo1->AddIndication(80,100,"red"); +$odo2->AddIndication(20,30,"green"); +$odo2->AddIndication(65,100,"red"); +$odo3->AddIndication(60,90,"yellow"); +$odo3->AddIndication(90,100,"red"); + +//--------------------------------------------------------------------- +// Set display values for the odometers +//--------------------------------------------------------------------- +$odo1->needle->Set(17); +$odo2->needle->Set(47); +$odo3->needle->Set(86); + +$odo1->needle->SetFillColor("blue"); +$odo2->needle->SetFillColor("yellow:0.7"); +$odo3->needle->SetFillColor("black"); +$odo3->needle->SetColor("black"); + + +//--------------------------------------------------------------------- +// Set scale label properties +//--------------------------------------------------------------------- +$odo1->scale->label->SetColor("navy"); +$odo2->scale->label->SetColor("blue"); +$odo3->scale->label->SetColor("darkred"); + +$odo1->scale->label->SetFont(FF_FONT1); +$odo2->scale->label->SetFont(FF_FONT2,FS_BOLD); +$odo3->scale->label->SetFont(FF_ARIAL,FS_BOLD,10); + +//--------------------------------------------------------------------- +// Add the odometers to the graph using a vertical layout +//--------------------------------------------------------------------- +$l1 = new LayoutVert( array($odo1,$odo2,$odo3) ) ; +$graph->Add( $l1 ); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex012.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex012.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex012.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex012.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,119 @@ +SetShadow(); + +//--------------------------------------------------------------------- +// Specify title and subtitle using default fonts +// * Note each title may be multilines by using a '\n' as a line +// divider. +//--------------------------------------------------------------------- +$graph->title->Set("Result from 2002"); +$graph->title->SetColor("white"); +$graph->subtitle->Set("O1 - W-Site"); +$graph->subtitle->SetColor("white"); + +//--------------------------------------------------------------------- +// Specify caption. +// * (This is the text at the bottom of the graph.) The margins will +// automatically adjust to fit the height of the text. A caption +// may have multiple lines by including a '\n' character in the +// string. +//--------------------------------------------------------------------- +$graph->caption->Set("Fig1. Values within 85%\nconfidence intervall"); +$graph->caption->SetColor("white"); + +//--------------------------------------------------------------------- +// We will display two columns where the first column has +// three odometers (same as in example 11) and the second column +// has two odoemters +// The first thing to do is to create them +//--------------------------------------------------------------------- +$odo1 = new Odometer(); +$odo2 = new Odometer(); +$odo3 = new Odometer(); +$odo4 = new Odometer(); +$odo5 = new Odometer(); + + +//--------------------------------------------------------------------- +// Set caption for each odometer +//--------------------------------------------------------------------- +$odo1->caption->Set("April"); +$odo1->caption->SetFont(FF_ARIAL,FS_BOLD); +$odo2->caption->Set("May"); +$odo2->caption->SetFont(FF_FONT2,FS_BOLD); +$odo3->caption->Set("June"); +$odo3->caption->SetFont(FF_FONT2,FS_BOLD); +$odo4->caption->Set("Daily low average"); +$odo4->caption->SetFont(FF_FONT1,FS_BOLD); +$odo5->caption->Set("Daily high average"); +$odo5->caption->SetFont(FF_FONT1,FS_BOLD); + +//--------------------------------------------------------------------- +// Set Indicator bands for the odometers +//--------------------------------------------------------------------- +$odo1->AddIndication(80,100,"red"); +$odo2->AddIndication(20,30,"green"); +$odo2->AddIndication(65,100,"red"); +$odo3->AddIndication(60,90,"yellow"); +$odo3->AddIndication(90,100,"red"); + +//--------------------------------------------------------------------- +// Set display values for the odometers +//--------------------------------------------------------------------- +$odo1->needle->Set(17); +$odo2->needle->Set(47); +$odo3->needle->Set(86); +$odo4->needle->Set(22); +$odo5->needle->Set(77); + +$odo1->needle->SetFillColor("blue"); +$odo2->needle->SetFillColor("yellow:0.7"); +$odo3->needle->SetFillColor("black"); +$odo3->needle->SetColor("black"); + + +//--------------------------------------------------------------------- +// Set scale label properties +//--------------------------------------------------------------------- +$odo1->scale->label->SetColor("navy"); +$odo2->scale->label->SetColor("blue"); +$odo3->scale->label->SetColor("darkred"); + +$odo1->scale->label->SetFont(FF_FONT1); +$odo2->scale->label->SetFont(FF_FONT2,FS_BOLD); +$odo3->scale->label->SetFont(FF_ARIAL,FS_BOLD,10); + +//--------------------------------------------------------------------- +// Add the odometers to the graph using a vertical layout +//--------------------------------------------------------------------- +$l1 = new LayoutVert( array($odo1,$odo2,$odo3) ) ; +$l2 = new LayoutVert( array($odo4,$odo5) ) ; +$l3 = new LayoutHor( array($l1,$l2) ); +$graph->Add( $l3 ); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,69 @@ +title->Set("Odometer title"); +$graph->title->SetColor("white"); +$graph->subtitle->Set("2002-02-13"); +$graph->subtitle->SetColor("white"); + +//--------------------------------------------------------------------- +// Specify caption. +// * (This is the text at the bottom of the graph.) The margins will +// automatically adjust to fit the height of the text. A caption +// may have multiple lines by including a '\n' character in the +// string. +//--------------------------------------------------------------------- +$graph->caption->Set("First caption row\n... second row"); +$graph->caption->SetColor("white"); + +//--------------------------------------------------------------------- +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +//--------------------------------------------------------------------- +$odo = new Odometer(); + +//--------------------------------------------------------------------- +// Set color indication between values 80 and 100 as red +//--------------------------------------------------------------------- +$odo->AddIndication(80,100,"red"); + +//--------------------------------------------------------------------- +// Set display value for the odometer +//--------------------------------------------------------------------- +$odo->needle->Set(30); + +//--------------------------------------------------------------------- +// Add the odometer to the graph +//--------------------------------------------------------------------- +$graph->Add($odo); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,71 @@ +title->Set("Odometer title"); +$graph->title->SetColor("white"); +$graph->subtitle->Set("2002-02-13"); +$graph->subtitle->SetColor("white"); + +//--------------------------------------------------------------------- +// Specify caption. +// * (This is the text at the bottom of the graph.) The margins will +// automatically adjust to fit the height of the text. A caption +// may have multiple lines by including a '\n' character in the +// string. +//--------------------------------------------------------------------- +$graph->caption->Set("First caption row\n... second row"); +$graph->caption->SetColor("white"); + +//--------------------------------------------------------------------- +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +//--------------------------------------------------------------------- +$odo = new Odometer(); + +//--------------------------------------------------------------------- +// Set color indication +//--------------------------------------------------------------------- +$odo->AddIndication(0,50,"green"); +$odo->AddIndication(50,80,"yellow"); +$odo->AddIndication(80,100,"red"); + +//--------------------------------------------------------------------- +// Set display value for the odometer +//--------------------------------------------------------------------- +$odo->needle->Set(30); + +//--------------------------------------------------------------------- +// Add the odometer to the graph +//--------------------------------------------------------------------- +$graph->Add($odo); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,83 @@ +SetShadow(); + +//--------------------------------------------------------------------- +// Specify title and subtitle using default fonts +// * Note each title may be multilines by using a '\n' as a line +// divider. +//--------------------------------------------------------------------- +$graph->title->Set("Odometer title"); +$graph->title->SetColor("white"); +$graph->subtitle->Set("2002-02-13"); +$graph->subtitle->SetColor("white"); + +//--------------------------------------------------------------------- +// Specify caption. +// * (This is the text at the bottom of the graph.) The margins will +// automatically adjust to fit the height of the text. A caption +// may have multiple lines by including a '\n' character in the +// string. +//--------------------------------------------------------------------- +$graph->caption->Set("First caption row\n... second row"); +$graph->caption->SetColor("white"); + +//--------------------------------------------------------------------- +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +//--------------------------------------------------------------------- +$odo = new Odometer(); + +//--------------------------------------------------------------------- +// Set color indication +//--------------------------------------------------------------------- +$odo->AddIndication(0,50,"green"); +$odo->AddIndication(50,80,"yellow"); +$odo->AddIndication(80,100,"red"); + +//--------------------------------------------------------------------- +// Adjust scale ticks to be shown at 10 steps interval and scale +// labels at every second tick +//--------------------------------------------------------------------- +$odo->scale->SetTicks(10,2); + +//--------------------------------------------------------------------- +// Use a bold font for tick labels +//--------------------------------------------------------------------- +$odo->scale->label->SetFont(FF_FONT1, FS_BOLD); + +//--------------------------------------------------------------------- +// Set display value for the odometer +//--------------------------------------------------------------------- +$odo->needle->Set(30); + +//--------------------------------------------------------------------- +// Add the odometer to the graph +//--------------------------------------------------------------------- +$graph->Add($odo); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex04.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex04.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex04.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex04.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,96 @@ +title->Set("Odometer title"); +$graph->title->SetColor("white"); +$graph->subtitle->Set("2002-02-13"); +$graph->subtitle->SetColor("white"); + +//--------------------------------------------------------------------- +// Specify caption. +// * (This is the text at the bottom of the graph.) The margins will +// automatically adjust to fit the height of the text. A caption +// may have multiple lines by including a '\n' character in the +// string. +//--------------------------------------------------------------------- +$graph->caption->Set("First caption row\n... second row"); +$graph->caption->SetColor("white"); + +//--------------------------------------------------------------------- +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +//--------------------------------------------------------------------- +$odo = new Odometer(); + +//--------------------------------------------------------------------- +// Set color indication +//--------------------------------------------------------------------- +$odo->AddIndication(0,50,"green"); +$odo->AddIndication(50,80,"yellow"); +$odo->AddIndication(80,100,"red"); + +//--------------------------------------------------------------------- +// Set the center area that will not be affected by the color bands +//--------------------------------------------------------------------- +$odo->SetCenterAreaWidth(0.4); // Fraction of radius + +//--------------------------------------------------------------------- +// Adjust scale ticks to be shown at 10 steps interval and scale +// labels at every second tick +//--------------------------------------------------------------------- +$odo->scale->SetTicks(10,2); + +//--------------------------------------------------------------------- +// Use a bold font for tick labels +//--------------------------------------------------------------------- +$odo->scale->label->SetFont(FF_FONT1, FS_BOLD); + +//--------------------------------------------------------------------- +// Set display value for the odometer +//--------------------------------------------------------------------- +$odo->needle->Set(30); + +//--------------------------------------------------------------------- +// Set a new style for the needle +//--------------------------------------------------------------------- +$odo->needle->SetStyle(NEEDLE_STYLE_MEDIUM_TRIANGLE); +$odo->needle->SetLength(0.7); // Length as 70% of the radius +$odo->needle->SetFillColor("orange"); + + +//--------------------------------------------------------------------- +// Add the odometer to the graph +//--------------------------------------------------------------------- +$graph->Add($odo); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex05.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex05.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex05.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex05.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,123 @@ +SetColor("lightyellow"); + +//--------------------------------------------------------------------- +// Specify title and subtitle using default fonts +// * Note each title may be multilines by using a '\n' as a line +// divider. +//--------------------------------------------------------------------- +$graph->title->Set("Odometer title"); +$graph->title->SetColor("white"); +$graph->subtitle->Set("2002-02-13"); +$graph->subtitle->SetColor("white"); + +//--------------------------------------------------------------------- +// Specify caption. +// * (This is the text at the bottom of the graph.) The margins will +// automatically adjust to fit the height of the text. A caption +// may have multiple lines by including a '\n' character in the +// string. +//--------------------------------------------------------------------- +$graph->caption->Set("First caption row\n... second row"); +$graph->caption->SetColor("white"); + +//--------------------------------------------------------------------- +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +//--------------------------------------------------------------------- +$odo = new Odometer(); + +//--------------------------------------------------------------------- +// Set color indication +//--------------------------------------------------------------------- +$odo->AddIndication(0,50,"green"); +$odo->AddIndication(50,80,"yellow"); +$odo->AddIndication(80,100,"red"); + +//--------------------------------------------------------------------- +// Set the center area that will not be affected by the color bands +//--------------------------------------------------------------------- +$odo->SetCenterAreaWidth(0.4); // Fraction of radius + +//--------------------------------------------------------------------- +// Adjust scale ticks to be shown at 10 steps interval and scale +// labels at every second tick +//--------------------------------------------------------------------- +$odo->scale->SetTicks(10,2); + +//--------------------------------------------------------------------- +// Make the tick marks 2 pixel wide +//--------------------------------------------------------------------- +$odo->scale->SetTickWeight(2); + +//--------------------------------------------------------------------- +// Use a bold font for tick labels +//--------------------------------------------------------------------- +$odo->scale->label->SetFont(FF_FONT1, FS_BOLD); + +//--------------------------------------------------------------------- +// Set display value for the odometer +//--------------------------------------------------------------------- +$odo->needle->Set(78); + +//--------------------------------------------------------------------- +// Specify scale caption. Note that depending on the position of the +// indicator needle this label might be partially hidden. +//--------------------------------------------------------------------- +$odo->label->Set("% Passed"); + +//--------------------------------------------------------------------- +// Set a new style for the needle +//--------------------------------------------------------------------- +$odo->needle->SetStyle(NEEDLE_STYLE_MEDIUM_TRIANGLE); +$odo->needle->SetLength(0.7); // Length as 70% of the radius +$odo->needle->SetFillColor("orange"); + +//--------------------------------------------------------------------- +// Setup the second indicator needle +//--------------------------------------------------------------------- +$odo->needle2->Set(24); +$odo->needle2->SetStyle(NEEDLE_STYLE_SMALL_TRIANGLE); +$odo->needle2->SetLength(0.55); // Length as 70% of the radius +$odo->needle2->SetFillColor("lightgray"); +$odo->needle2->Show(); + + +//--------------------------------------------------------------------- +// Add the odometer to the graph +//--------------------------------------------------------------------- +$graph->Add($odo); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex06.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex06.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex06.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex06.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,122 @@ +SetColor("lightyellow"); + +//--------------------------------------------------------------------- +// Specify title and subtitle using default fonts +// * Note each title may be multilines by using a '\n' as a line +// divider. +//--------------------------------------------------------------------- +$graph->title->Set("Odometer title"); +$graph->title->SetColor("white"); +$graph->subtitle->Set("2002-02-13"); +$graph->subtitle->SetColor("white"); + +//--------------------------------------------------------------------- +// Specify caption. +// * (This is the text at the bottom of the graph.) The margins will +// automatically adjust to fit the height of the text. A caption +// may have multiple lines by including a '\n' character in the +// string. +//--------------------------------------------------------------------- +$graph->caption->Set("First caption row\n... second row"); +$graph->caption->SetColor("white"); + +//--------------------------------------------------------------------- +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +//--------------------------------------------------------------------- +$odo = new Odometer(ODO_FULL); + +//--------------------------------------------------------------------- +// Set color indication +//--------------------------------------------------------------------- +$odo->AddIndication(0,50,"green"); +$odo->AddIndication(50,80,"yellow"); +$odo->AddIndication(80,100,"red"); + +//--------------------------------------------------------------------- +// Set the center area that will not be affected by the color bands +//--------------------------------------------------------------------- +$odo->SetCenterAreaWidth(0.4); // Fraction of radius + +//--------------------------------------------------------------------- +// Adjust scale ticks to be shown at 10 steps interval and scale +// labels at every second tick +//--------------------------------------------------------------------- +$odo->scale->SetTicks(10,2); + +//--------------------------------------------------------------------- +// Make the tick marks 2 pixel wide +//--------------------------------------------------------------------- +$odo->scale->SetTickWeight(2); + +//--------------------------------------------------------------------- +// Use a bold font for tick labels +//--------------------------------------------------------------------- +$odo->scale->label->SetFont(FF_FONT1, FS_BOLD); + +//--------------------------------------------------------------------- +// Set display value for the odometer +//--------------------------------------------------------------------- +$odo->needle->Set(78); + +//--------------------------------------------------------------------- +// Specify scale caption. Note that depending on the position of the +// indicator needle this label might be partially hidden. +//--------------------------------------------------------------------- +$odo->label->Set("% Passed"); + +//--------------------------------------------------------------------- +// Set a new style for the needle +//--------------------------------------------------------------------- +$odo->needle->SetStyle(NEEDLE_STYLE_MEDIUM_TRIANGLE); +$odo->needle->SetLength(0.7); // Length as 70% of the radius +$odo->needle->SetFillColor("orange"); + +//--------------------------------------------------------------------- +// Setup the second indicator needle +//--------------------------------------------------------------------- +$odo->needle2->Set(24); +$odo->needle2->SetStyle(NEEDLE_STYLE_SMALL_TRIANGLE); +$odo->needle2->SetLength(0.55); // Length as 70% of the radius +$odo->needle2->SetFillColor("lightgray"); +$odo->needle2->Show(); + + +//--------------------------------------------------------------------- +// Add the odometer to the graph +//--------------------------------------------------------------------- +$graph->Add($odo); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex07.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex07.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex07.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex07.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,126 @@ +SetColor("lightyellow"); + +//--------------------------------------------------------------------- +// Specify title and subtitle using default fonts +// * Note each title may be multilines by using a '\n' as a line +// divider. +//--------------------------------------------------------------------- +$graph->title->Set("Odometer title"); +$graph->title->SetColor("white"); +$graph->subtitle->Set("2002-02-13"); +$graph->subtitle->SetColor("white"); + +//--------------------------------------------------------------------- +// Specify caption. +// * (This is the text at the bottom of the graph.) The margins will +// automatically adjust to fit the height of the text. A caption +// may have multiple lines by including a '\n' character in the +// string. +//--------------------------------------------------------------------- +$graph->caption->Set("First caption row\n... second row"); +$graph->caption->SetColor("white"); + +//--------------------------------------------------------------------- +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +//--------------------------------------------------------------------- +$odo = new Odometer(ODO_FULL); + +//--------------------------------------------------------------------- +// Set color indication +//--------------------------------------------------------------------- +$odo->AddIndication(0,50,"green"); +$odo->AddIndication(50,80,"yellow"); +$odo->AddIndication(80,100,"red"); + +//--------------------------------------------------------------------- +// Set the center area that will not be affected by the color bands +//--------------------------------------------------------------------- +$odo->SetCenterAreaWidth(0.4); // Fraction of radius + +//--------------------------------------------------------------------- +// Adjust scale ticks to be shown at 10 steps interval and scale +// labels at every second tick +//--------------------------------------------------------------------- +$odo->scale->SetTicks(10,2); + +//--------------------------------------------------------------------- +// Make the tick marks 2 pixel wide +//--------------------------------------------------------------------- +$odo->scale->SetTickWeight(2); + +//--------------------------------------------------------------------- +// Use a bold font for tick labels +//--------------------------------------------------------------------- +$odo->scale->label->SetFont(FF_FONT1, FS_BOLD); + +//--------------------------------------------------------------------- +// Change the start and end angle for the scale +//--------------------------------------------------------------------- +$odo->scale->SetAngle(20,340); + +//--------------------------------------------------------------------- +// Set display value for the odometer +//--------------------------------------------------------------------- +$odo->needle->Set(64); + +//--------------------------------------------------------------------- +// Specify scale caption. Note that depending on the position of the +// indicator needle this label might be partially hidden. +//--------------------------------------------------------------------- +$odo->label->Set("% Passed"); + +//--------------------------------------------------------------------- +// Set a new style for the needle +//--------------------------------------------------------------------- +$odo->needle->SetStyle(NEEDLE_STYLE_MEDIUM_TRIANGLE); +$odo->needle->SetLength(0.7); // Length as 70% of the radius +$odo->needle->SetFillColor("orange"); + +//--------------------------------------------------------------------- +// Setup the second indicator needle +//--------------------------------------------------------------------- +$odo->needle2->Set(15); +$odo->needle2->SetStyle(NEEDLE_STYLE_SMALL_TRIANGLE); +$odo->needle2->SetLength(0.55); // Length as 70% of the radius +$odo->needle2->SetFillColor("lightgray"); +$odo->needle2->Show(); + + +//--------------------------------------------------------------------- +// Add the odometer to the graph +//--------------------------------------------------------------------- +$graph->Add($odo); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex08.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex08.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex08.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex08.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,150 @@ +SetShadow(); + +//--------------------------------------------------------------------- +// Change the color of the odometer plotcanvas. NOT the odometer +// fill color itself. +//--------------------------------------------------------------------- +$graph->SetColor("lightyellow"); + +//--------------------------------------------------------------------- +// Change the color of the margin in the graph +//--------------------------------------------------------------------- +$graph->SetMarginColor("khaki:0.6"); + +//--------------------------------------------------------------------- +// Specify title and subtitle using default fonts +// * Note each title may be multilines by using a '\n' as a line +// divider. +//--------------------------------------------------------------------- +$graph->title->Set("Odometer title"); +$graph->title->SetColor("white"); +$graph->subtitle->Set("2002-02-13"); +$graph->subtitle->SetColor("white"); + +//--------------------------------------------------------------------- +// Specify caption. +// * (This is the text at the bottom of the graph.) The margins will +// automatically adjust to fit the height of the text. A caption +// may have multiple lines by including a '\n' character in the +// string. +//--------------------------------------------------------------------- +$graph->caption->Set("First caption row\n... second row"); +$graph->caption->SetColor("white"); + +//--------------------------------------------------------------------- +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +//--------------------------------------------------------------------- +$odo = new Odometer(ODO_FULL); + +//--------------------------------------------------------------------- +// Set fill color for odometer +//--------------------------------------------------------------------- +$odo->SetColor("lightblue"); + +//--------------------------------------------------------------------- +// Set color indication +//--------------------------------------------------------------------- +$odo->AddIndication(0,50,"green"); +$odo->AddIndication(50,80,"yellow"); +$odo->AddIndication(80,100,"red"); + +//--------------------------------------------------------------------- +// Set the center area that will not be affected by the color bands +//--------------------------------------------------------------------- +$odo->SetCenterAreaWidth(0.4); // Fraction of radius + +//--------------------------------------------------------------------- +// Adjust scale ticks to be shown at 10 steps interval and scale +// labels at every second tick +//--------------------------------------------------------------------- +$odo->scale->SetTicks(10,2); + +//--------------------------------------------------------------------- +// Make the tick marks 2 pixel wide +//--------------------------------------------------------------------- +$odo->scale->SetTickWeight(2); + +//--------------------------------------------------------------------- +// Use a bold font for tick labels +//--------------------------------------------------------------------- +$odo->scale->label->SetFont(FF_FONT1, FS_BOLD); + +//--------------------------------------------------------------------- +// Change the start and end angle for the scale +//--------------------------------------------------------------------- +$odo->scale->SetAngle(20,340); + +//--------------------------------------------------------------------- +// Set display value for the odometer +//--------------------------------------------------------------------- +$odo->needle->Set(64); + +//--------------------------------------------------------------------- +// Specify scale caption. Note that depending on the position of the +// indicator needle this label might be partially hidden. +//--------------------------------------------------------------------- +$odo->label->Set("% Passed"); + +//--------------------------------------------------------------------- +// Set a new style for the needle +//--------------------------------------------------------------------- +$odo->needle->SetStyle(NEEDLE_STYLE_MEDIUM_TRIANGLE); +$odo->needle->SetLength(0.7); // Length as 70% of the radius +$odo->needle->SetFillColor("orange"); + +//--------------------------------------------------------------------- +// Setup the second indicator needle +//--------------------------------------------------------------------- +$odo->needle2->Set(15); +$odo->needle2->SetStyle(NEEDLE_STYLE_SMALL_TRIANGLE); +$odo->needle2->SetLength(0.55); // Length as 70% of the radius +$odo->needle2->SetFillColor("lightgray"); + +// Only the first needle is shown by default +$odo->needle2->Show(); + +//--------------------------------------------------------------------- +// Add a drop shadow to the indicator needles +//--------------------------------------------------------------------- +$odo->needle->SetShadow(); +$odo->needle2->SetShadow(); + +//--------------------------------------------------------------------- +// Add the odometer to the graph +//--------------------------------------------------------------------- +$graph->Add($odo); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex09.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex09.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odoex09.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odoex09.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +needle->Set(17); +$odo2->needle->Set(47); +$odo3->needle->Set(86); + +//--------------------------------------------------------------------- +// Add the odometers to the graph using a vertical layout +//--------------------------------------------------------------------- +$l1 = new LayoutVert( array($odo1,$odo2,$odo3) ) ; +$graph->Add( $l1 ); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex00.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex00.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex00.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex00.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +needle->Set(30); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the client +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +needle->Set(30); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the client +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +title->Set("Result for 2002"); +$graph->title->SetColor("white"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->subtitle->Set("New York Office"); +$graph->subtitle->SetColor("white"); +$graph->caption->Set("Figure 1. Branch results."); +$graph->caption->SetColor("white"); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo = new Odometer(); + +// Set display value for the odometer +$odo->needle->Set(30); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the client +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +title->Set("Result for 2002"); +$graph->title->SetColor("white"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->subtitle->Set("New York Office"); +$graph->subtitle->SetColor("white"); +$graph->caption->Set("Figure 1.This is a very, very\nlong text with multiples lines\nthat are added as a caption."); +$graph->caption->SetColor("white"); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo = new Odometer(); + +// Set display value for the odometer +$odo->needle->Set(30); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the client +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex04.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex04.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex04.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex04.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +title->Set("Result for 2002"); +$graph->title->SetColor("white"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->subtitle->Set("New York Office"); +$graph->subtitle->SetColor("white"); +$graph->caption->Set("Figure 1.This is a very, very\nlong text with multiples lines\nthat are added as a caption."); +$graph->caption->SetColor("white"); + +// Setup colors +// Make the border 40% darker than normal "khaki" +$graph->SetMarginColor("khaki:0.6"); +$graph->SetColor("khaki"); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo = new Odometer(); + +// Setup colors for odometyer plot +$odo->SetColor('white'); +$odo->scale->label->SetColor("darkred"); +$odo->needle->SetFillColor("yellow"); + +// Set display value for the odometer +$odo->needle->Set(30); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the client +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex06.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex06.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex06.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex06.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,43 @@ +SetColor("lightyellow"); + $odo[$i]->needle->Set(80); + $odo[$i]->needle->SetStyle($nstyle[$i]); + $odo[$i]->caption->Set($captions[$i]); + $odo[$i]->caption->SetFont(FF_FONT1); + $odo[$i]->caption->SetMargin(3); +} + +// Use the automatic layout engine to positon the plots on the graph +$row1 = new LayoutHor( array($odo[0],$odo[1],$odo[2]) ); +$row2 = new LayoutHor( array($odo[3],$odo[4],$odo[5]) ); +$col1 = new LayoutVert( array($row1,$row2) ); + +// Add the odometer to the graph +$graph->Add($col1); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex07.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex07.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex07.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex07.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +SetColor("lightyellow"); + $odo[$i]->needle->Set(75); + $odo[$i]->needle->SetStyle(NEEDLE_STYLE_ENDARROW, $astyles[$i]); + $odo[$i]->caption->SetFont(FF_FONT1,FS_BOLD); + $odo[$i]->caption->Set('Arrow: '.$acaptions[$i]); +} + +$row1 = new LayoutHor( array($odo[0],$odo[1],$odo[2]) ); +$row2 = new LayoutHor( array($odo[3],$odo[4],$odo[5]) ); +$row3 = new LayoutHor( array($odo[6],$odo[7],$odo[8]) ); +$col1 = new LayoutVert( array($row1,$row2,$row3) ); + +// Add the odometer to the graph +$graph->Add($col1); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex08.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex08.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex08.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex08.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +title->Set('An example with thick border'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,11); + +// Add drop shadow for graph +$graph->SetShadow(); + +// Set some nonstandard colors +$color = array(205,220,205); +$graph->SetMarginColor($color); +$graph->SetColor($color); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo = new Odometer(); +$odo->SetColor('white'); +$odo->SetBorder('darkgreen:0.8',5); + +$odo->scale->label->SetFont(FF_ARIAL,FS_BOLD,10); +$odo->scale->label->SetColor('brown:0.6'); + +// Set display value for the odometer +$odo->needle->Set(70); + +// Add drop shadow for needle +$odo->needle->SetShadow(); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex08.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex08.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex08.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex08.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +title->Set('An example with drop shadows'); + +// Add drop shadow for graph +$graph->SetShadow(); + +// Set some nonstandard colors +$color = array(205,220,205); +$graph->SetMarginColor($color); +$graph->SetColor($color); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo = new Odometer(); +$odo->SetColor('white'); + +// Set display value for the odometer +$odo->needle->Set(70); + +// Add drop shadow for needle +$odo->needle->SetShadow(); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex09.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex09.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex09.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex09.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +SetColor("lightyellow"); + $odo[$i]->needle->Set(75); + $odo[$i]->needle->SetStyle(NEEDLE_STYLE_ENDARROW, $astyles[$i]); + $odo[$i]->caption->SetFont(FF_FONT1); + $odo[$i]->caption->Set($acaptions[$i]); + $odo[$i]->SetMargin(15); +} + +$row1 = new LayoutHor( array($odo[0],$odo[1],$odo[2]) ); +$row2 = new LayoutHor( array($odo[3],$odo[4],$odo[5]) ); +$row3 = new LayoutHor( array($odo[6],$odo[7],$odo[8]) ); +$col1 = new LayoutVert( array($row1,$row2,$row3) ); + +// Add the odometer to the graph +$graph->Add($col1); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex10.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex10.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex10.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex10.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,43 @@ +title->Set('Example with scale indicators'); + +// Add drop shadow for graph +$graph->SetShadow(); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo = new Odometer(ODO_HALF); + +// Add color indications +$odo->AddIndication(0,20,"green:0.7"); +$odo->AddIndication(20,30,"green:0.9"); +$odo->AddIndication(30,60,"yellow"); +$odo->AddIndication(60,80,"orange"); +$odo->AddIndication(80,100,"red"); + +// Set display value for the odometer +$odo->needle->Set(90); + +//--------------------------------------------------------------------- +// Add drop shadow for needle +//--------------------------------------------------------------------- +$odo->needle->SetShadow(); + +//--------------------------------------------------------------------- +// Add the odometer to the graph +//--------------------------------------------------------------------- +$graph->Add($odo); + +//--------------------------------------------------------------------- +// ... and finally stroke and stream the image back to the browser +//--------------------------------------------------------------------- +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex11.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex11.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex11.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex11.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +title->Set('Example with scale indicators'); + +// Add drop shadow for graph +$graph->SetShadow(); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo = new Odometer(ODO_HALF); + +// Add color indications +$odo->AddIndication(0,20,"green:0.7"); +$odo->AddIndication(20,30,"green:0.9"); +$odo->AddIndication(30,60,"yellow"); +$odo->AddIndication(60,80,"orange"); +$odo->AddIndication(80,100,"red"); + +// Set display value for the odometer +$odo->needle->Set(90); + +// Set the size of the non-colored base area to 40% of the radius +$odo->SetCenterAreaWidth(0.45); + +// Add drop shadow for needle +$odo->needle->SetShadow(); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex12.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex12.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex12.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex12.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,47 @@ +title->Set('Example with scale indicators'); + +// Add drop shadow for graph +$graph->SetShadow(); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo = new Odometer(ODO_HALF); + +// Add color indications +$odo->AddIndication(0,20,"green:0.7"); +$odo->AddIndication(20,30,"green:0.9"); +$odo->AddIndication(30,60,"yellow"); +$odo->AddIndication(60,80,"orange"); +$odo->AddIndication(80,100,"red"); + +// Set display value for the odometer +$odo->needle->Set(90); + +// Set the size of the non-colored base area to 40% of the radius +$odo->SetCenterAreaWidth(0.45); + +// Add drop shadow for needle +$odo->needle->SetShadow(); + +// Setup the second needle +$odo->needle2->Set(44); +$odo->needle2->Show(); +$odo->needle2->SetLength(0.4); +$odo->needle2->SetFillColor("navy"); +$odo->needle2->SetShadow(); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); + +// EOF +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex13.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex13.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex13.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex13.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +title->Set('Example with scale indicators'); + +// Add drop shadow for graph +$graph->SetShadow(); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo = new Odometer(ODO_HALF); + +// Add color indications +$odo->AddIndication(0,20,"green:0.7"); +$odo->AddIndication(20,30,"green:0.9"); +$odo->AddIndication(30,60,"yellow"); +$odo->AddIndication(60,80,"orange"); +$odo->AddIndication(80,100,"red"); + +$odo->SetCenterAreaWidth(0.45); + +// Set display value for the odometer +$odo->needle->Set(90); + +// Add scale labels +$odo->label->Set("mBar"); +$odo->label->SetFont(FF_FONT2,FS_BOLD); + +// Add drop shadow for needle +$odo->needle->SetShadow(); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex14.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex14.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex14.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex14.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,35 @@ +title->Set('Custom scale'); +$graph->title->SetColor('white'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD); + +// Add drop shadow for graph +$graph->SetShadow(); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo = new Odometer(); +$odo->SetColor('lightyellow'); + +// Setup the scale +$odo->scale->Set(100,600); +$odo->scale->SetTicks(50,2); + +// Set display value for the odometer +$odo->needle->Set(280); + +// Add drop shadow for needle +$odo->needle->SetShadow(); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex15.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex15.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex15.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex15.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +title->Set('Custom formatting'); +$graph->title->SetColor('white'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD); + +// Add drop shadow for graph +$graph->SetShadow(); + +// Now we need to create an odometer to add to the graph. +$odo = new Odometer(); +$odo->SetColor("lightgray:1.9"); + +// Setup the scale +$odo->scale->Set(100,600); +$odo->scale->SetTicks(50,2); +$odo->scale->SetTickColor('brown'); +$odo->scale->SetTickLength(0.05); +$odo->scale->SetTickWeight(2); + +$odo->scale->SetLabelPos(0.75); +$odo->scale->label->SetFont(FF_FONT1, FS_BOLD); +$odo->scale->label->SetColor('brown'); +$odo->scale->label->SetFont(FF_ARIAL,FS_NORMAL,10); + +// Setup a label with a degree mark +$odo->scale->SetLabelFormat('%dC'.SymChar::Get('degree')); + +// Set display value for the odometer +$odo->needle->Set(280); + +// Add drop shadow for needle +$odo->needle->SetShadow(); + +// Add the odometer to the graph +$graph->Add($odo); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex16.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex16.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex16.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex16.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetShadow(); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo1 = new Odometer(); +$odo2 = new Odometer(); +$odo1->SetColor("lightgray:1.9"); +$odo2->SetColor("lightgray:1.9"); + +// Adjust start and end angle for the scale +$odo2->scale->SetAngle(110,250); + +$odo1->scale->label->SetFont(FF_ARIAL,FS_BOLD,10); +$odo2->scale->label->SetFont(FF_ARIAL,FS_BOLD,10); +$odo2->AddIndication(-15,0,'lightgray'); +$odo2->AddIndication(100,115,'lightgray'); + +// Set display value for the odometer +$odo1->needle->Set(70); +$odo2->needle->Set(70); + +// Add drop shadow for needle +$odo1->needle->SetShadow(); +$odo2->needle->SetShadow(); + +// Specify the layout for the two odometers +$row = new LayoutHor( array($odo1,$odo2) ); + +// Add the odometer to the graph +$graph->Add($row); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex16.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex16.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex16.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex16.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +SetShadow(); + +// Now we need to create an odometer to add to the graph. +// By default the scale will be 0 to 100 +$odo1 = new Odometer(); +$odo2 = new Odometer(); +$odo1->SetColor("lightgray:1.9"); +$odo2->SetColor("lightgray:1.9"); + +// Adjust start and end angle for the scale +$odo2->scale->SetAngle(110,250); + +$odo1->scale->label->SetFont(FF_ARIAL,FS_BOLD,10); +$odo2->scale->label->SetFont(FF_ARIAL,FS_BOLD,10); + +// Set display value for the odometer +$odo1->needle->Set(70); +$odo2->needle->Set(70); + +// Add drop shadow for needle +$odo1->needle->SetShadow(); +$odo2->needle->SetShadow(); + +// Specify the layout for the two odometers +$row = new LayoutHor( array($odo1,$odo2) ); + +// Add the odometer to the graph +$graph->Add($row); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex17.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex17.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex17.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex17.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +title->Set('Manual positioning'); +$graph->title->SetColor('white'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +// Add drop shadow for graph +$graph->SetShadow(); + +// Now we need to create an odometer to add to the graph. +$odo1 = new Odometer(); +$odo2 = new Odometer(); +$odo1->SetColor('lightgray:1.9'); +$odo2->SetColor('lightgray:1.9'); + +// Set display value for the odometer +$odo1->needle->Set(37); +$odo2->needle->Set(73); + +// Add drop shadow for needle +$odo1->needle->SetShadow(); +$odo2->needle->SetShadow(); + +// Specify the position for the two odometers +$odo1->SetPos(180,110); +$odo1->SetSize(100); +$odo2->SetPos(110,250); +$odo2->SetSize(100); + +// Set captions for the odometers +$odo1->caption->Set("(x,y) = (180,120)\nradius=100"); +$odo2->caption->Set("(x,y) = (110,270)\nradius=100"); + +// Add the odometer to the graph +$graph->Add($odo1); +$graph->Add($odo2); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex18.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex18.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex18.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex18.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +SetColor('lightgray:1.9'); + $odo[$i]->needle->Set(10+$i*17); + $odo[$i]->needle->SetShadow(); + if( $i < 2 ) + $fsize = 10; + else + $fsize = 8; + $odo[$i]->scale->label->SetFont(FF_ARIAL,FS_NORMAL,$fsize); + $odo[$i]->AddIndication(92,100,'red'); + $odo[$i]->AddIndication(80,92,'orange'); + $odo[$i]->AddIndication(60,80,'yellow'); +} + +// Create the layout +$row1 = new LayoutHor( array($odo[0],$odo[1]) ); +$row2 = new LayoutHor( array($odo[2],$odo[3],$odo[4]) ); +$col1 = new LayoutVert( array($row1,$row2) ); + +// Add the odometer to the graph +$graph->Add($col1); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex19.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex19.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex19.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/odotutex19.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ +SetColor('lightgray:1.9'); + $odo[$i]->needle->Set(10+$i*17); + $odo[$i]->needle->SetShadow(); + if( $i < 2 ) + $fsize = 10; + else + $fsize = 8; + $odo[$i]->scale->label->SetFont(FF_ARIAL,FS_NORMAL,$fsize); + $odo[$i]->AddIndication(92,100,'red'); + $odo[$i]->AddIndication(80,92,'orange'); + $odo[$i]->AddIndication(60,80,'yellow'); +} + +// Create the layout +$row1 = new LayoutHor( array($odo[0],$odo[1]) ); +$row2 = new LayoutHor( array($odo[2],$odo[3],$odo[4]) ); +$col1 = new LayoutVert( array($row1,$row2) ); + +// Add the odometer to the graph +$graph->Add($col1); + +// Add an icon and text +$icon = new IconPlot('jpglogo.jpg',250,10,0.85,30); +$icon->SetAnchor('center','top'); +$graph->Add($icon); + +$t = new Text('JpGraph',250,70); +$t->SetAlign('center','top'); +#$t->SetFont(FF_VERA,FS_BOLD,11); +$t->SetColor('darkgray'); +$graph->Add($t); + +// ... and finally stroke and stream the image back to the browser +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/orange_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/orange_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/orange_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/orange_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ + array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ), + 1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ), + 2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ), + 3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ), + 4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ), + 5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ), + 6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ), + 7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ), + 8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ), +); + + +// Create the graph. These two calls are always required +$graph = new Graph(400,300); + +$graph->SetScale("textlin"); +if ($theme) { + $graph->SetTheme(new $theme()); +} +$theme_class = new OrangeTheme; +$graph->SetTheme($theme_class); + +$plot = array(); +// Create the bar plots +for ($i = 0; $i < 4; $i++) { + $plot[$i] = new BarPlot($data[$i]); + $plot[$i]->SetLegend('plot'.($i+1)); +} +//$acc1 = new AccBarPlot(array($plot[0], $plot[1])); +//$acc1->value->Show(); +$gbplot = new GroupBarPlot(array($plot[2], $plot[1] )); + +for ($i = 4; $i < 8; $i++) { + $plot[$i] = new LinePlot($data[$i]); + $plot[$i]->SetLegend('plot'.$i); + $plot[$i]->value->Show(); +} + +$graph->Add($gbplot); +$graph->Add($plot[4]); + +$title = "OrangeTheme Example"; +$title = mb_convert_encoding($title,'UTF-8'); +$graph->title->Set($title); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/partiallyfilledlineex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/partiallyfilledlineex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/partiallyfilledlineex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/partiallyfilledlineex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,45 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetShadow(true); +$graph->SetMarginColor("lightblue"); + +// Setup format for legend +$graph->legend->SetFillColor("antiquewhite"); +$graph->legend->SetShadow(true); + +// Setup title +$graph->title->Set("Filled Area Example"); +$graph->title->SetFont(FF_FONT2,FS_BOLD); + +// Setup semi-filled line plot +$lineplot = new LinePlot($ydata); +$lineplot->SetLegend("Semi-filled\nLineplot"); + +// Set line color +$lineplot->SetColor("black"); + +// Setup the two areas to be filled +$lineplot->AddArea(2,5,LP_AREA_FILLED,"red"); +$lineplot->AddArea(6,8,LP_AREA_FILLED,"green"); + +// Display the marks on the lines +$lineplot->mark->SetType(MARK_DIAMOND); +$lineplot->mark->SetSize(8); +$lineplot->mark->Show(); + +// add plot to the graph +$graph->Add($lineplot); + +// display graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pastel_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pastel_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pastel_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pastel_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,57 @@ + array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ), + 1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ), + 2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ), + 3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ), + 4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ), + 5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ), + 6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ), + 7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ), + 8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ), +); + + +// Create the graph. These two calls are always required +$graph = new Graph(400,300); + +$graph->SetScale("textlin"); +if ($theme) { + $graph->SetTheme(new $theme()); +} +$theme_class = new PastelTheme; +$graph->SetTheme($theme_class); + +$plot = array(); +// Create the bar plots +for ($i = 0; $i < 4; $i++) { + $plot[$i] = new BarPlot($data[$i]); + $plot[$i]->SetLegend('plot'.($i+1)); +} +//$acc1 = new AccBarPlot(array($plot[0], $plot[1])); +//$acc1->value->Show(); +$gbplot = new GroupBarPlot(array($plot[2], $plot[1] )); + +for ($i = 4; $i < 8; $i++) { + $plot[$i] = new LinePlot($data[$i]); + $plot[$i]->SetLegend('plot'.$i); + $plot[$i]->value->Show(); +} + +$graph->Add($gbplot); +$graph->Add($plot[4]); + +$title = "PastelTheme Example"; +$title = mb_convert_encoding($title,'UTF-8'); +$graph->title->Set($title); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,8 @@ +Stroke($data); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1b.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1b.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1b.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1b.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,20 @@ +Stroke($data); +} +catch(JpGraphException $e) { + echo 'PDF417 Error: '.$e->GetMessage(); +} +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1c.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1c.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1c.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1c.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +ShowText(true); + $backend->SetModuleWidth($modwidth); + $backend->Stroke($data); +} +catch(JpGraphException $e) { + echo 'PDF417 Error: '.$e->GetMessage(); +} +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,13 @@ +Stroke($data); +} +catch(JpGraphException $e) { + echo 'PDF417 Error: '.$e->GetMessage(); +} +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,24 @@ +SetModuleWidth($modwidth); + $backend->SetHeight($height); + $backend->Stroke($data); +} +catch(JpGraphException $e) { + echo 'PDF417 Error: '.$e->GetMessage(); +} +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,26 @@ +SetModuleWidth($modwidth); + $backend->SetHeight($height); + $backend->NoText(!$showtext); + $backend->Stroke($data); +} +catch(JpGraphException $e) { + echo 'PDF417 Error: '.$e->GetMessage(); +} +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,28 @@ +SetModuleWidth($modwidth); + $backend->SetHeight($height); + $backend->NoText(!$showtext); + $backend->SetColor('black','yellow'); + $backend->Stroke($data); +} +catch(JpGraphException $e) { + echo 'PDF417 Error: '.$e->GetMessage(); +} +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,29 @@ +SetModuleWidth($modwidth); + $backend->SetHeight($height); + $backend->NoText(!$showtext); + $backend->SetColor('black','yellow'); + $output = $backend->Stroke($data); + echo nl2br(htmlspecialchars($output)); +} +catch(JpGraphException $e) { + echo 'PDF417 Error: '.$e->GetMessage(); +} +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pdf417_ex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,35 @@ +SetModuleWidth($modwidth); + $backend->NoText(!$showtext); + $backend->Stroke($data); +} +catch(JpGraphException $e) { + echo 'PDF417 Error: '.$e->GetMessage(); +} +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/penguin.png and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/penguin.png differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3d_csimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3d_csimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3d_csimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3d_csimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,43 @@ +SetShadow(); + +// Set A title for the plot +$graph->title->Set("3D Pie Client side image map"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create +$p1 = new PiePlot3D($data); +$p1->SetLegends(array("Jan (%d)","Feb","Mar","Apr","May","Jun","Jul")); +$targ=array("pie3d_csimex1.php?v=1","pie3d_csimex1.php?v=2","pie3d_csimex1.php?v=3", + "pie3d_csimex1.php?v=4","pie3d_csimex1.php?v=5","pie3d_csimex1.php?v=6"); +$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); +$p1->SetCSIMTargets($targ,$alts); + +// Use absolute labels +$p1->SetLabelType(1); +$p1->value->SetFormat("%d kr"); + +// Move the pie slightly to the left +$p1->SetCenter(0.4,0.5); + +$graph->Add($p1); + + +// Send back the HTML page which will call this script again +// to retrieve the image. +$graph->StrokeCSIM(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,32 @@ +SetShadow(); + +// Set A title for the plot +$graph->title->Set("Example 1 3D Pie plot"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,18); +$graph->title->SetColor("darkblue"); +$graph->legend->Pos(0.1,0.2); + +// Create pie plot +$p1 = new PiePlot3d($data); +$p1->SetTheme("sand"); +$p1->SetCenter(0.4); +$p1->SetAngle(30); +$p1->value->SetFont(FF_ARIAL,FS_NORMAL,12); +$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct")); + +$graph->Add($p1); +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,45 @@ +SetShadow(); + + +// Set A title for the plot +$graph->title->Set("Example 2 3D Pie plot"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,18); +$graph->title->SetColor("darkblue"); +$graph->legend->Pos(0.1,0.2); + +// Create 3D pie plot +$p1 = new PiePlot3d($data); +$p1->SetTheme("sand"); +$p1->SetCenter(0.4); +$p1->SetSize(0.4); +$p1->SetHeight(5); + +// Adjust projection angle +$p1->SetAngle(45); + +// You can explode several slices by specifying the explode +// distance for some slices in an array +$p1->Explode(array(0,40,0,30)); + +// As a shortcut you can easily explode one numbered slice with +// $p1->ExplodeSlice(3); + +$p1->value->SetFont(FF_ARIAL,FS_NORMAL,10); +$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct")); + +$graph->Add($p1); +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetShadow(); + +// Set A title for the plot +$graph->title->Set("Example 3 3D Pie plot"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,18); +$graph->title->SetColor("darkblue"); +$graph->legend->Pos(0.1,0.2); + +// Create 3D pie plot +$p1 = new PiePlot3d($data); +$p1->SetTheme("sand"); +$p1->SetCenter(0.4); +$p1->SetSize(80); + +// Adjust projection angle +$p1->SetAngle(45); + +// As a shortcut you can easily explode one numbered slice with +$p1->ExplodeSlice(3); + +// Setup the slice values +$p1->value->SetFont(FF_ARIAL,FS_BOLD,11); +$p1->value->SetColor("navy"); + +$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct")); + +$graph->Add($p1); +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +SetShadow(); + +// Set A title for the plot +$graph->title->Set("Example 4 3D Pie plot"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,18); +$graph->title->SetColor("darkblue"); +$graph->legend->Pos(0.1,0.2); + +// Create 3D pie plot +$p1 = new PiePlot3d($data); +$p1->SetTheme("sand"); +$p1->SetCenter(0.4); +$p1->SetSize(80); + +// Adjust projection angle +$p1->SetAngle(45); + +// Adjsut angle for first slice +$p1->SetStartAngle(45); + +// As a shortcut you can easily explode one numbered slice with +$p1->ExplodeSlice(3); + +// Setup slice values +$p1->value->SetFont(FF_ARIAL,FS_BOLD,11); +$p1->value->SetColor("navy"); + + +$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct")); + +$graph->Add($p1); +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie3dex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +SetShadow(); + +// Set A title for the plot +$graph->title->Set("Example 5 3D Pie plot"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,18); +$graph->title->SetColor("darkblue"); +$graph->legend->Pos(0.1,0.2); + +// Create 3D pie plot +$p1 = new PiePlot3d($data); +$p1->SetTheme("sand"); +$p1->SetCenter(0.4); +$p1->SetSize(80); + +// Adjust projection angle +$p1->SetAngle(45); + +// Adjsut angle for first slice +$p1->SetStartAngle(45); + +// Display the slice values +$p1->value->SetFont(FF_ARIAL,FS_BOLD,11); +$p1->value->SetColor("navy"); + +// Add colored edges to the 3D pie +// NOTE: You can't have exploded slices with edges! +$p1->SetEdge("navy"); + +$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct")); + +$graph->Add($p1); +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/piebkgex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/piebkgex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/piebkgex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/piebkgex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,94 @@ +SetMargin(1,1,40,1); +$graph->SetMarginColor('navy'); +$graph->SetShadow(false); + +// Setup background +$graph->SetBackgroundImage('worldmap1.jpg',BGIMG_FILLPLOT); + +// Setup title +$graph->title->Set("Pie plots with background image"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,20); +$graph->title->SetColor('white'); + +$p = array(); +// Create the plots +for( $i=0; $i < $n; ++$i ) { + $d = "data$i"; + $p[] = new PiePlot3D($data[$i]); +} + +// Position the four pies +for( $i=0; $i < $n; ++$i ) { + $p[$i]->SetCenter($piepos[2*$i],$piepos[2*$i+1]); +} + +// Set the titles +for( $i=0; $i < $n; ++$i ) { + $p[$i]->title->Set($titles[$i]); + $p[$i]->title->SetColor('white'); + $p[$i]->title->SetFont(FF_ARIAL,FS_BOLD,12); +} + +// Label font and color setup +for( $i=0; $i < $n; ++$i ) { + $p[$i]->value->SetFont(FF_ARIAL,FS_BOLD); + $p[$i]->value->SetColor('white'); +} + +// Show the percetages for each slice +for( $i=0; $i < $n; ++$i ) { + $p[$i]->value->Show(); +} + +// Label format +for( $i=0; $i < $n; ++$i ) { + $p[$i]->value->SetFormat("%01.1f%%"); +} + +// Size of pie in fraction of the width of the graph +for( $i=0; $i < $n; ++$i ) { + $p[$i]->SetSize(0.15); +} + +// Format the border around each slice + + +for( $i=0; $i < $n; ++$i ) { + $p[$i]->SetEdge(false); + $p[$i]->ExplodeSlice(1); +} + +// Use one legend for the whole graph +$p[0]->SetLegends(array("May","June","July","Aug")); +$graph->legend->Pos(0.05,0.35); +$graph->legend->SetShadow(false); + +for( $i=0; $i < $n; ++$i ) { + $graph->Add($p[$i]); +} + +$graph->Stroke(); +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/piec_csimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/piec_csimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/piec_csimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/piec_csimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,87 @@ +SetFrame(false); + +// Uncomment this line to add a drop shadow to the border +// $graph->SetShadow(); + +// Setup title +$graph->title->Set("CSIM Center Pie plot ex 1"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,18); +$graph->title->SetMargin(8); // Add a little bit more margin from the top + +// Create the pie plot +$p1 = new PiePlotC($data); + +// Set the radius of pie (as fraction of image size) +$p1->SetSize(0.32); + +// Move the center of the pie slightly to the top of the image +$p1->SetCenter(0.5,0.45); + +// Label font and color setup +$p1->value->SetFont(FF_ARIAL,FS_BOLD,12); +$p1->value->SetColor('white'); + +// Setup the title on the center circle +$p1->midtitle->Set("Test mid\nRow 1\nRow 2"); +$p1->midtitle->SetFont(FF_ARIAL,FS_NORMAL,14); + +// Set color for mid circle +$p1->SetMidColor('yellow'); + +// Use percentage values in the legends values (This is also the default) +$p1->SetLabelType(PIE_VALUE_PER); + +// The label array values may have printf() formatting in them. The argument to the +// form,at string will be the value of the slice (either the percetage or absolute +// depending on what was specified in the SetLabelType() above. +$lbl = array("adam\n%.1f%%","bertil\n%.1f%%","johan\n%.1f%%", + "peter\n%.1f%%","daniel\n%.1f%%","erik\n%.1f%%"); +$p1->SetLabels($lbl); + +// Uncomment this line to remove the borders around the slices +// $p1->ShowBorder(false); + +// Add drop shadow to slices +$p1->SetShadow(); + +// Explode all slices 15 pixels +$p1->ExplodeAll(15); + +// Setup the CSIM targets +$targ=array("piec_csimex1.php#1","piec_csimex1.php#2","piec_csimex1.php#3", + "piec_csimex1.php#4","piec_csimex1.php#5","piec_csimex1.php#6"); +$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); +$p1->SetCSIMTargets($targ,$alts); +$p1->SetMidCSIM("piec_csimex1.php#7","Center"); + + +// Setup a small help text in the image +$txt = new Text("Note: This is an example of image map. Hold\nyour mouse over the slices to see the values.\nThe URL just points back to this page"); +$txt->SetFont(FF_FONT1,FS_BOLD); +$txt->SetPos(0.5,0.97,'center','bottom'); +$txt->SetBox('yellow','black'); +$txt->SetShadow(); +$graph->AddText($txt); + +// Add plot to pie graph +$graph->Add($p1); + +// .. and send the image on it's marry way to the browser +$graph->StrokeCSIM(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/piecex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/piecex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/piecex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/piecex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +title->Set("Pie plot with center circle"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->title->SetMargin(8); // Add a little bit more margin from the top + +// Create the pie plot +$p1 = new PiePlotC($data); + +// Set size of pie +$p1->SetSize(0.32); + +// Label font and color setup +$p1->value->SetFont(FF_ARIAL,FS_BOLD,10); +$p1->value->SetColor('black'); + +// Setup the title on the center circle +$p1->midtitle->Set("Test mid\nRow 1\nRow 2"); +$p1->midtitle->SetFont(FF_ARIAL,FS_NORMAL,10); + +// Set color for mid circle +$p1->SetMidColor('yellow'); + +// Use percentage values in the legends values (This is also the default) +$p1->SetLabelType(PIE_VALUE_PER); + +// Add plot to pie graph +$graph->Add($p1); + +// .. and send the image on it's marry way to the browser +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/piecex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/piecex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/piecex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/piecex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,70 @@ +SetFrame(false); + +// Uncomment this line to add a drop shadow to the border +// $graph->SetShadow(); + +// Setup title +$graph->title->Set("PiePlotC"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,18); +$graph->title->SetMargin(8); // Add a little bit more margin from the top + +// Create the pie plot +$p1 = new PiePlotC($data); + +// Set size of pie +$p1->SetSize(0.35); + +// Label font and color setup +$p1->value->SetFont(FF_ARIAL,FS_BOLD,12); +$p1->value->SetColor('white'); + +$p1->value->Show(); + +// Setup the title on the center circle +$p1->midtitle->Set("Test mid\nRow 1\nRow 2"); +$p1->midtitle->SetFont(FF_ARIAL,FS_NORMAL,14); + +// Set color for mid circle +$p1->SetMidColor('yellow'); + +// Use percentage values in the legends values (This is also the default) +$p1->SetLabelType(PIE_VALUE_PER); + +// The label array values may have printf() formatting in them. The argument to the +// form,at string will be the value of the slice (either the percetage or absolute +// depending on what was specified in the SetLabelType() above. +$lbl = array("adam\n%.1f%%","bertil\n%.1f%%","johan\n%.1f%%", + "peter\n%.1f%%","daniel\n%.1f%%","erik\n%.1f%%"); +$p1->SetLabels($lbl); + +// Uncomment this line to remove the borders around the slices +// $p1->ShowBorder(false); + +// Add drop shadow to slices +$p1->SetShadow(); + +// Explode all slices 15 pixels +$p1->ExplodeAll(15); + +// Add plot to pie graph +$graph->Add($p1); + +// .. and send the image on it's marry way to the browser +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie_csimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie_csimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pie_csimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pie_csimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,35 @@ +SetShadow(); + +// Set A title for the plot +$graph->title->Set("Client side image map"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create +$p1 = new PiePlot($data); +$p1->SetCenter(0.4,0.5); + +$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul")); +$targ=array("pie_csimex1.php#1","pie_csimex1.php#2","pie_csimex1.php#3", +"pie_csimex1.php#4","pie_csimex1.php#5","pie_csimex1.php#6"); +$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); +$p1->SetCSIMTargets($targ,$alts); + +$graph->Add($p1); + + +// Send back the HTML page which will call this script again +// to retrieve the image. +$graph->StrokeCSIM(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,31 @@ +clearTheme(); +$graph->SetShadow(); + +// Set A title for the plot +$graph->title->Set("Example 1 Pie plot"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); +$graph->title->SetColor("brown"); + +// Create pie plot +$p1 = new PiePlot($data); +//$p1->SetSliceColors(array("red","blue","yellow","green")); +$p1->SetTheme("earth"); + +$p1->value->SetFont(FF_ARIAL,FS_NORMAL,10); +// Set how many pixels each slice should explode +$p1->Explode(array(0,15,15,25,15)); + + +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +clearTheme(); +$graph->SetShadow(); + +// Set A title for the plot +$graph->title->Set("Example 2 Pie plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create +$p1 = new PiePlot($data); +$p1->SetLegends(array("Jan","Feb","Mar","Apr","May","Jun","Jul")); +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +clearTheme(); +$graph->SetShadow(); + +// Set A title for the plot +$graph->title->Set("Multiple - Pie plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create plots +$size=0.13; +$p1 = new PiePlot($data); +$p1->SetLegends(array("Jan","Feb","Mar","Apr","May")); +$p1->SetSize($size); +$p1->SetCenter(0.25,0.32); +$p1->value->SetFont(FF_FONT0); +$p1->title->Set("2001"); + +$p2 = new PiePlot($data); +$p2->SetSize($size); +$p2->SetCenter(0.65,0.32); +$p2->value->SetFont(FF_FONT0); +$p2->title->Set("2002"); + +$p3 = new PiePlot($data); +$p3->SetSize($size); +$p3->SetCenter(0.25,0.75); +$p3->value->SetFont(FF_FONT0); +$p3->title->Set("2003"); + +$p4 = new PiePlot($data); +$p4->SetSize($size); +$p4->SetCenter(0.65,0.75); +$p4->value->SetFont(FF_FONT0); +$p4->title->Set("2004"); + +$graph->Add($p1); +$graph->Add($p2); +$graph->Add($p3); +$graph->Add($p4); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,24 @@ +clearTheme(); +$graph->SetShadow(); + +$graph->title->Set("Example 4 of pie plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$p1 = new PiePlot($data); +$p1->value->SetFont(FF_FONT1,FS_BOLD); +$p1->value->SetColor("darkred"); +$p1->SetSize(0.3); +$p1->SetCenter(0.4); +$p1->SetLegends(array("Jan","Feb","Mar","Apr","May")); +$graph->Add($p1); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +clearTheme(); +$graph->SetShadow(); + +// Setup graph title +$graph->title->Set("Example 5 of pie plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Create pie plot +$p1 = new PiePlot($data); +$p1->value->SetFont(FF_VERDANA,FS_BOLD); +$p1->value->SetColor("darkred"); +$p1->SetSize(0.3); +$p1->SetCenter(0.4); +$p1->SetLegends(array("Jan","Feb","Mar","Apr","May")); +//$p1->SetStartAngle(M_PI/8); +$p1->ExplodeSlice(3); + +$graph->Add($p1); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,47 @@ +clearTheme(); +$graph->SetShadow(); + +// Setup title +$graph->title->Set("Example of pie plot with absolute labels"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// The pie plot +$p1 = new PiePlot($data); + +// Move center of pie to the left to make better room +// for the legend +$p1->SetCenter(0.35,0.5); + +// No border +$p1->ShowBorder(false); + +// Label font and color setup +$p1->value->SetFont(FF_FONT1,FS_BOLD); +$p1->value->SetColor("darkred"); + +// Use absolute values (type==1) +$p1->SetLabelType(PIE_VALUE_ABS); + +// Label format +$p1->value->SetFormat("$%d"); +$p1->value->Show(); + +// Size of pie in fraction of the width of the graph +$p1->SetSize(0.3); + +// Legends +$p1->SetLegends(array("May ($%d)","June ($%d)","July ($%d)","Aug ($%d)")); +$graph->legend->Pos(0.05,0.15); + +$graph->Add($p1); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +clearTheme(); +$graph->SetShadow(); + +// Setup title +$graph->title->Set("Pie plot with absolute labels"); +$graph->subtitle->Set('(With hidden 0 labels)'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// The pie plot +$p1 = new PiePlot($data); + + +// Move center of pie to the left to make better room +// for the legend +$p1->SetCenter(0.35,0.5); + +// No border +$p1->ShowBorder(false); + +// Label font and color setup +$p1->value->SetFont(FF_FONT1,FS_BOLD); +$p1->value->SetColor("darkred"); + +// Use absolute values (type==1) +$p1->SetLabelType(PIE_VALUE_ABS); + +// Label format +$p1->value->SetFormat("$%d"); +$p1->value->HideZero(); +$p1->value->Show(); + +// Size of pie in fraction of the width of the graph +$p1->SetSize(0.3); + +// Legends +$p1->SetLegends(array("May ($%d)","June ($%d)","July ($%d)","Aug ($%d)")); +$graph->legend->Pos(0.05,0.2); + +$graph->Add($p1); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex8.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex8.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex8.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex8.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +clearTheme(); +$graph->SetShadow(); + +// Title setup +$graph->title->Set("Adjusting the label pos"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Setup the pie plot +$p1 = new PiePlot($data); + +// Adjust size and position of plot +$p1->SetSize(0.4); +$p1->SetCenter(0.5,0.52); + +// Setup slice labels and move them into the plot +$p1->value->SetFont(FF_FONT1,FS_BOLD); +$p1->value->SetColor("darkred"); +$p1->SetLabelPos(0.6); + +// Finally add the plot +$graph->Add($p1); + +// ... and stroke it +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex9.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex9.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pieex9.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pieex9.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,40 @@ +clearTheme(); +$graph->SetShadow(); + +// Title setup +$graph->title->Set("Exploding all slices"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Setup the pie plot +$p1 = new PiePlot($data); + +// Adjust size and position of plot +$p1->SetSize(0.35); +$p1->SetCenter(0.5,0.52); + +// Setup slice labels and move them into the plot +$p1->value->SetFont(FF_FONT1,FS_BOLD); +$p1->value->SetColor("darkred"); +$p1->SetLabelPos(0.65); + +// Explode all slices +$p1->ExplodeAll(10); + +// Add drop shadow +$p1->SetShadow(); + +// Finally add the plot +$graph->Add($p1); + +// ... and stroke it +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +title->Set("Label guide lines"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor("darkblue"); +$graph->legend->Pos(0.1,0.2); + + +// Create pie plot +$p1 = new PiePlot($data); +$p1->SetCenter(0.5,0.55); +$p1->SetSize(0.3); + +// Enable and set policy for guide-lines +$p1->SetGuideLines(); +$p1->SetGuideLinesAdjust(1.4); + +// Setup the labels +$p1->SetLabelType(PIE_VALUE_PER); +$p1->value->Show(); +$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9); +$p1->value->SetFormat('%2.1f%%'); + +// Add and stroke +$graph->Add($p1); +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +title->Set("Label guide lines"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor("darkblue"); +$graph->legend->Pos(0.1,0.2); + + +// Create pie plot +$p1 = new PiePlot($data); +$p1->SetCenter(0.5,0.55); +$p1->SetSize(0.3); + +// Enable and set policy for guide-lines. Make labels line up vertically +$p1->SetGuideLines(true,false); +$p1->SetGuideLinesAdjust(1.5); + +// Setup the labels +$p1->SetLabelType(PIE_VALUE_PER); +$p1->value->Show(); +$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9); +$p1->value->SetFormat('%2.1f%%'); + +// Add and stroke +$graph->Add($p1); +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +title->Set("Label guide lines"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor("darkblue"); +$graph->legend->Pos(0.1,0.2); + + +// Create pie plot +$p1 = new PiePlot($data); +$p1->SetCenter(0.5,0.55); +$p1->SetSize(0.3); + +// Enable and set policy for guide-lines. Make labels line up vertically +// and force guide lines to always beeing used +$p1->SetGuideLines(true,false,true); +$p1->SetGuideLinesAdjust(1.5); + +// Setup the labels +$p1->SetLabelType(PIE_VALUE_PER); +$p1->value->Show(); +$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9); +$p1->value->SetFormat('%2.1f%%'); + +// Add and stroke +$graph->Add($p1); +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +title->Set("Label guide lines"); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor("darkblue"); +$graph->legend->Pos(0.1,0.2); + + +// Create pie plot +$p1 = new PiePlot($data); +$p1->SetCenter(0.5,0.55); +$p1->SetSize(0.3); + +// Enable and set policy for guide-lines. Make labels line up vertically +$p1->SetGuideLines(true,false); +$p1->SetGuideLinesAdjust(1.1); + +// Setup the labels +$p1->SetLabelType(PIE_VALUE_PER); +$p1->value->Show(); +$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9); +$p1->value->SetFormat('%2.1f%%'); + +// Add and stroke +$graph->Add($p1); +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pielabelsex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +SetShadow(); + +// Set A title for the plot +$graph->title->Set('String labels with values'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor('black'); + +// Create pie plot +$p1 = new PiePlot($data); +$p1->SetCenter(0.5,0.5); +$p1->SetSize(0.3); + +// Setup the labels to be displayed +$p1->SetLabels($labels); + +// This method adjust the position of the labels. This is given as fractions +// of the radius of the Pie. A value < 1 will put the center of the label +// inside the Pie and a value >= 1 will pout the center of the label outside the +// Pie. By default the label is positioned at 0.5, in the middle of each slice. +$p1->SetLabelPos(1); + +// Setup the label formats and what value we want to be shown (The absolute) +// or the percentage. +$p1->SetLabelType(PIE_VALUE_PER); +$p1->value->Show(); +$p1->value->SetFont(FF_ARIAL,FS_NORMAL,9); +$p1->value->SetColor('darkgray'); + +// Add and stroke +$graph->Add($p1); +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +SetScale('textlin'); +$graph->SetMargin(25,10,20,25); +$graph->SetBox(true); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_3DPLANE,15,35,'khaki4'); +$band->SetDensity(10); +$band->ShowFrame(true); +$graph->AddBand($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_3DPLANE, Density=10'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +SetScale('textlin'); +$graph->SetMargin(25,10,20,25); +$graph->SetBox(true); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_3DPLANE,15,35,'khaki4'); +$band->SetDensity(40); +$band->ShowFrame(true); +$graph->AddBand($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_3DPLANE, Density=40'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/plotbanddensity_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,38 @@ +SetScale('textlin'); +$graph->SetMargin(25,10,20,25); +$graph->SetBox(true); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); +$graph->ygrid->Show(false); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_3DPLANE,15,35,'khaki4'); +$band->SetDensity(80); +$band->ShowFrame(true); +$graph->AddBand($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_3DPLANE, Density=80'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/plotlineex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/plotlineex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/plotlineex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/plotlineex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMargin(40,20,50,70); + +$graph->legend->SetPos(0.5,0.97,'center','bottom'); + +$graph->title->Set('Plot line legend'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +$graph->SetTitleBackground('lightblue:1.3',TITLEBKG_STYLE2,TITLEBKG_FRAME_BEVEL); +$graph->SetTitleBackgroundFillStyle(TITLEBKG_FILLSTYLE_HSTRIPED,'lightblue','navy'); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->value->Show(); +$bplot->value->SetFont(FF_VERDANA,FS_BOLD,8); +$bplot->SetValuePos('top'); +$bplot->SetLegend('Bar Legend'); +$graph->Add($bplot); + +$pline = new PlotLine(HORIZONTAL,8,'red',2); +$pline->SetLegend('Line Legend'); +$graph->legend->SetColumns(10); +$graph->Add($pline); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarclockex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarclockex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarclockex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarclockex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,55 @@ +SetScale('lin',150); + +$graph->SetMarginColor('#FFE6C0'); +$graph->SetType(POLAR_360); +$graph->SetMargin(40,40,50,40); +$graph->SetClockwise(true); + +//$graph->Set90AndMargin(60,50,70,120); + +$graph->SetBox(true); +$graph->SetFrame(false); +$graph->axis->ShowGrid(true,false,true); +$graph->axis->SetGridColor('gray','gray','gray'); + +$graph->axis->SetFont(FF_ARIAL,FS_NORMAL,8); +$graph->axis->SetTitle('X-Axis','center'); + +$graph->axis->SetColor('black','black','darkred'); +$graph->axis->SetAngleFont(FF_ARIAL,FS_NORMAL,8); + +$graph->title->Set('Clockwise polar plot'); +$graph->title->SetFont(FF_COMIC,FS_NORMAL,16); +$graph->title->SetColor('navy'); + + + +$p = new PolarPlot($data); +$p->SetFillColor('lightblue@0.5'); +$graph->Add($p); + +//$p2 = new PolarPlot($data2); +//$p2->SetFillColor('red@0.5'); +//$graph->Add($p2); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarclockex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarclockex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarclockex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarclockex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +SetScale('lin',150); + +$graph->SetMarginColor('#FFE6C0'); +$graph->SetType(POLAR_360); +$graph->SetClockwise(true); +$graph->Set90AndMargin(40,40,50,40); + +$graph->SetBox(true); +$graph->SetFrame(false); +$graph->axis->ShowGrid(true,false,true); +$graph->axis->SetGridColor('gray','gray','gray'); + +$graph->axis->SetFont(FF_ARIAL,FS_NORMAL,8); +$graph->axis->SetTitle('X-Axis','center'); + +$graph->axis->SetColor('black','black','darkred'); +$graph->axis->SetAngleFont(FF_ARIAL,FS_NORMAL,8); + +$graph->title->Set('Clockwise polar plot (rotated)'); +$graph->title->SetFont(FF_COMIC,FS_NORMAL,16); +$graph->title->SetColor('navy'); + + + +$p = new PolarPlot($data); +$p->SetFillColor('lightblue@0.5'); +$graph->Add($p); + +//$p2 = new PolarPlot($data2); +//$p2->SetFillColor('red@0.5'); +//$graph->Add($p2); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polar_csimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polar_csimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polar_csimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polar_csimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,69 @@ +SetScale('log',100); +$graph->SetType(POLAR_180); + +// Hide frame around graph (by setting width=0) +$graph->SetFrame(true,'white',1); + +// Show both major and minor grid lines +$graph->axis->ShowGrid(true,true); + +// Set color for gradient lines +$graph->axis->SetGridColor('lightblue:0.9','lightblue:0.9','lightblue:0.9'); + +// Set label and axis colors +$graph->axis->SetColor('black','navy','darkred'); + +// Draw the ticks on the bottom side of the radius axis +$graph->axis->SetTickSide(SIDE_DOWN); + +// Increase the margin for the labels since we changed the +// side of the ticks. +$graph->axis->SetLabelMargin(6); + +// Change fonts +$graph->axis->SetFont(FF_ARIAL,FS_NORMAL,8); +$graph->axis->SetAngleFont(FF_ARIAL,FS_NORMAL,8); + +// Setup axis title +$graph->axis->SetTitle('Coverage (in meter)','middle'); +$graph->axis->title->SetFont(FF_FONT1,FS_BOLD); + +// Setup graph title +$graph->title->Set('Polar plot #9'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->SetColor('navy'); + +// Setup tab title +$graph->tabtitle->Set('Microphone #1'); +$graph->tabtitle->SetColor('brown:0.5','lightyellow'); + +// Setup the polar plot with CSIM targets for the marks +$p = new PolarPlot($data); +$p->SetFillColor('lightblue@0.5'); +$p->mark->SetType(MARK_SQUARE); +$p->mark->SetWidth(10); +$p->SetCSIMTargets( $targets ); + +$graph->Add($p); + +$graph->StrokeCSIM(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex0-180.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex0-180.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex0-180.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex0-180.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,27 @@ +SetScale('lin'); +$graph->SetMargin(35,35,25,25); +$graph->SetType(POLAR_180); + +$p = new PolarPlot($data); +$p->SetFillColor('lightblue@0.5'); +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,26 @@ +SetScale('lin'); +$graph->SetMargin(35,35,25,25); + +$p = new PolarPlot($data); +$p->SetFillColor('lightblue@0.5'); +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex10.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex10.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex10.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex10.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,66 @@ +SetScale('log',100); +$graph->SetType(POLAR_360); + +// Hide frame around graph (by setting width=0) +$graph->SetFrame(true,'white',1); + +// Show both major and minor grid lines +$graph->axis->ShowGrid(true,true); + +// Set color for gradient lines +$graph->axis->SetGridColor('lightblue:0.9','lightblue:0.9','lightblue:0.9'); + +// Set label and axis colors +$graph->axis->SetColor('black','navy','darkred'); + +// Draw the ticks on the bottom side of the radius axis +$graph->axis->SetTickSide(SIDE_DOWN); + +// Increase the margin for the labels since we changed the +// side of the ticks. +$graph->axis->SetLabelMargin(6); + +// Change fonts +$graph->axis->SetFont(FF_ARIAL,FS_NORMAL,8); +$graph->axis->SetAngleFont(FF_ARIAL,FS_NORMAL,8); + + +// Setup graph title +$graph->title->Set('Polar plot #10'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->SetColor('navy'); + +// Setup tab title +$graph->tabtitle->Set('Microphone #1'); +$graph->tabtitle->SetColor('brown:0.5','lightyellow'); + + +$p = new PolarPlot($data); +$p->SetFillColor('lightblue@0.5'); +$p->mark->SetType(MARK_SQUARE); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +SetScale('lin'); +$graph->SetType(POLAR_180); +//$graph->SetAngle(90); +//$graph->SetMargin(30-150,30-150,30+150,30+150); +$graph->Set90AndMargin(40,40,40,40); +//$graph->axis->SetLabelAlign('right','center'); + +$p = new PolarPlot($data); +$p->SetLegend("Test"); +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +SetScale('lin'); + +$graph->title->Set('Polar plot #2'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->title->SetColor('navy'); + +// Hide last labels on the Radius axis +// They intersect with the box otherwise +$graph->axis->HideLastTickLabel(); + +$p = new PolarPlot($data); +$p->SetFillColor('lightred@0.5'); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex3-lin.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex3-lin.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex3-lin.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex3-lin.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ +SetScale('lin',200); +$graph->SetType(POLAR_180); + +$graph->title->Set('Polar plot #3'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->title->SetColor('navy'); + +$graph->axis->ShowGrid(true,false); + +$p = new PolarPlot($data); +$p->SetFillColor('lightred@0.5'); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ +SetScale('log',100); +$graph->SetType(POLAR_180); + +$graph->title->Set('Polar plot #3'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->title->SetColor('navy'); + +$graph->axis->ShowGrid(true,false); + +$p = new PolarPlot($data); +$p->SetFillColor('lightred@0.5'); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +SetScale('log'); + +$graph->title->Set('Polar plot #4'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->title->SetColor('navy'); + +// Hide last labels on the Radius axis +// They intersect with the box otherwise +$graph->axis->HideLastTickLabel(); + +$p = new PolarPlot($data); +$p->SetFillColor('lightred@0.5'); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,37 @@ +SetScale('log'); + +// Show both major and minor grid lines +$graph->axis->ShowGrid(true,true); + +$graph->title->Set('Polar plot #5'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->title->SetColor('navy'); + +// Hide last labels on the Radius axis +// They intersect with the box otherwise +$graph->axis->HideLastTickLabel(); + +$p = new PolarPlot($data); +$p->SetFillColor('lightred@0.5'); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,35 @@ +SetScale('log'); +$graph->SetType(POLAR_180); + +// Show both major and minor grid lines +$graph->axis->ShowGrid(true,true); + +$graph->title->Set('Polar plot #6'); +$graph->title->SetFont(FF_FONT2,FS_BOLD); +$graph->title->SetColor('navy'); + + +$p = new PolarPlot($data); +$p->SetFillColor('lightred@0.5'); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7-1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7-1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7-1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7-1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +SetScale('log',100); +$graph->SetType(POLAR_180); +$graph->SetPlotSize(220,250); + +// Hide frame around graph (by setting width=0) +$graph->SetFrame(true,'white',1); + +$graph->SetBackgroundGradient('blue:1.3','brown:1.4',GRAD_HOR,BGRAD_PLOT); + +// Set color for gradient lines +$graph->axis->SetGridColor('gray','gray','gray'); + +// Setup axis title +$graph->axis->SetTitle('Coverage (in meter)','middle'); +$graph->axis->title->SetFont(FF_FONT1,FS_BOLD); + +$graph->title->Set('Polar plot #7'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->SetColor('navy'); + +// Adjust legen box position and color +$graph->legend->SetColor('navy','darkgray'); +$graph->legend->SetFillColor('white'); +$graph->legend->SetShadow('darkgray@0.5',5); + +$p = new PolarPlot($data); +$p->SetFillColor('lightblue@0.5'); +$p->mark->SetType(MARK_SQUARE); +$p->SetLegend("Mirophone #1\n(No amps)"); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7-2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7-2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7-2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7-2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +SetScale('log',100); +$graph->SetType(POLAR_360); +$graph->SetPlotSize(220,300); + +// Hide frame around graph (by setting width=0) +$graph->SetFrame(true,'white',1); + +$graph->SetBackgroundGradient('blue:1.3','brown:1.4',GRAD_MIDHOR,BGRAD_PLOT); + +// Set color for gradient lines +$graph->axis->SetGridColor('gray','gray','gray'); + +$graph->title->Set('Polar plot #7-2'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->SetColor('navy'); + +// Adjust legen box position and color +$graph->legend->SetColor('navy','darkgray'); +$graph->legend->SetFillColor('white'); +$graph->legend->SetShadow('darkgray@0.5',5); + +$p = new PolarPlot($data); +$p->SetFillColor('yellow@0.6'); +$p->mark->SetType(MARK_SQUARE); +$p->SetLegend("Mirophone #1\n(No amps)"); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +SetScale('lin',300); +$graph->SetType(POLAR_180); +$graph->SetPlotSize(220,250); + +// Hide frame around graph (by setting width=0) +$graph->SetFrame(true,'white',1); + +$graph->SetBackgroundGradient('blue:1.3','brown:1.4',GRAD_HOR,BGRAD_PLOT); + +// Show both major and minor grid lines +$graph->axis->ShowGrid(true,true); + +// Set color for gradient lines +$graph->axis->SetGridColor('gray','gray','gray'); + +// Setup axis title +$graph->axis->SetTitle('Coverage (in meter)','middle'); +$graph->axis->title->SetFont(FF_FONT1,FS_BOLD); + +$graph->title->Set('Polar plot #7'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->SetColor('navy'); + +// Adjust legen box position and color +$graph->legend->SetColor('navy','darkgray'); +$graph->legend->SetFillColor('white'); +$graph->legend->SetShadow('darkgray@0.5',5); + +$p = new PolarPlot($data); +$p->SetFillColor('lightblue@0.5'); +$p->mark->SetType(MARK_SQUARE); +$p->SetLegend("Mirophone #1\n(No amps)"); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex8.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex8.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex8.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex8.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,54 @@ +SetScale('log',100); +$graph->SetType(POLAR_180); +//$graph->SetPlotSize(250,250); + +// Hide frame around graph (by setting width=0) +$graph->SetFrame(true,'white',1); + +// Set plotarea color +$graph->SetColor('lightblue'); + +// Show both major and minor grid lines +$graph->axis->ShowGrid(true,true); + +// Set color for gradient lines +$graph->axis->SetGridColor('lightblue:0.8','lightblue:0.8','lightblue:0.8'); + +// Setup axis title +$graph->axis->SetTitle('Coverage (in meter)','middle'); +$graph->axis->title->SetFont(FF_FONT1,FS_BOLD); + +$graph->title->Set('Polar plot #8'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->SetColor('navy'); + +// Adjust legen box position and color +$graph->legend->SetColor('navy','darkgray'); +$graph->legend->SetFillColor('white'); +$graph->legend->SetShadow('darkgray@0.5',5); + +$p = new PolarPlot($data); +$p->SetFillColor('white@0.5'); +$p->mark->SetType(MARK_SQUARE); +$p->SetLegend("Mirophone #1\n(No amps)"); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex9.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex9.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/polarex9.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/polarex9.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,63 @@ +SetScale('log',100); +$graph->SetType(POLAR_180); + +// Hide frame around graph (by setting width=0) +$graph->SetFrame(true,'white',1); + +// Show both major and minor grid lines +$graph->axis->ShowGrid(true,true); + +// Set color for gradient lines +$graph->axis->SetGridColor('lightblue:0.9','lightblue:0.9','lightblue:0.9'); + +// Set label and axis colors +$graph->axis->SetColor('black','navy','darkred'); + +// Draw the ticks on the bottom side of the radius axis +$graph->axis->SetTickSide(SIDE_DOWN); + +// Increase the margin for the labels since we changed the +// side of the ticks. +$graph->axis->SetLabelMargin(6); + +// Change fonts +$graph->axis->SetFont(FF_ARIAL,FS_NORMAL,8); +$graph->axis->SetAngleFont(FF_ARIAL,FS_NORMAL,8); + +// Setup axis title +$graph->axis->SetTitle('Coverage (in meter)','middle'); +$graph->axis->title->SetFont(FF_FONT1,FS_BOLD); + +// Setup graph title +$graph->title->Set('Polar plot #9'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->SetColor('navy'); + +// Setup tab title +$graph->tabtitle->Set('Microphone #1'); +$graph->tabtitle->SetColor('brown:0.5','lightyellow'); + + +$p = new PolarPlot($data); +$p->SetFillColor('lightblue@0.5'); +$p->mark->SetType(MARK_SQUARE); + +$graph->Add($p); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/prepaccdata_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/prepaccdata_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/prepaccdata_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/prepaccdata_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,61 @@ +title->Set('Accumulated values with specified X-axis scale'); +$graph->SetScale('textlin'); + +// Setup margin color +$graph->SetMarginColor('green@0.95'); + +// Adjust the margin to make room for the X-labels +$graph->SetMargin(40,30,40,120); + +// Turn the tick marks out from the plot area +$graph->xaxis->SetTickSide(SIDE_BOTTOM); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +$p0 =new LinePlot($ydata[0]); +$p0->SetFillColor('sandybrown'); +$p1 =new LinePlot($ydata[1]); +$p1->SetFillColor('lightblue'); +$p2 =new LinePlot($ydata[2]); +$p2->SetFillColor('red'); +$ap = new AccLinePlot(array($p0,$p1,$p2)); + +$graph->xaxis->SetTickLabels($xdata); +$graph->xaxis->SetTextLabelInterval(4); + +// Add the plot to the graph +$graph->Add($ap); + +// Set the angle for the labels to 90 degrees +$graph->xaxis->SetLabelAngle(90); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pression.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pression.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pression.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pression.php 2020-11-05 05:14:42.000000000 +0000 @@ -0,0 +1,107 @@ + $data[ 1 ] )$ws_pr_n = $data[ 1 ]; //pression miN + // création des séries, la première, $ws_prb, pour les basses pressions, limitée à 1015 ; la seconde, $ws_prh, pour les hautes pressions + if ( $data[ 1 ] > 1015 ) { + $ws_prb[ $i ] = 1015; + $ws_prh[ $i ] = $data[ 1 ]; + } else { + $ws_prb[ $i ] = $data[ 1 ]; + $ws_prh[ $i ] = $data[ 1 ]; + } +} // fin de la lecture du fichier + +if ( $ws_pr_n > 1015 ) { + $ws_pr_n = 1015; +}; +$ws_pr_n = floor( $ws_pr_n - .4 ); +$ws_pr_x = ceil( $ws_pr_x + .4 ); + +//--------------------------------------------------------------------------- +// Create the graph +$graph = new Graph( 1000, 400 ); +//$graph->title->Set('Pression atmosphérique des 72 dernières heures'); +$graph->SetScale( "datlin", $ws_pr_n, $ws_pr_x ); +$graph->img->SetMargin( 60, 10, 10, 130 ); + +$yh = new LinePLot( $ws_prh, $ws_dt ); +$yh->SetFillColor( '#ffff00' ); //jaune +$yh->SetColor( '#ffff00' ); +$graph->Add( $yh ); + +$yb = new LinePLot( $ws_prb, $ws_dt ); +$yb->SetFillColor( '#0000ff' ); //bleu +$yb->SetColor( '#0000ff' ); +$graph->Add( $yb ); + + + +//Set the angle for the labels to 90 degrees +$graph->xaxis->SetLabelAngle( 90 ); +$graph->xaxis->SetPos( $ws_pr_n ); + +// The automatic format string for dates can be overridden +$graph->xaxis->scale->SetDateFormat( 'd/m/Y H:i' ); + + +// fond, bandes +$band = new PlotBand( HORIZONTAL, BAND_SOLID, $ws_pr_n, $ws_pr_x , 'white' ); +$band->ShowFrame(false); +//$band->SetDensity(100); +$graph->AddBand( $band ); + +//transparence +$graph->SetMarginColor( 'white' ); +$graph->SetFrame( false ); + +//$graph->ClearTheme(); + +$graph->img->SetTransparent( 'white' ); + + +$graph->title->SetFont( FF_FONT1, FS_BOLD ); +$graph->yaxis->SetFont( FF_FONT1, FS_BOLD ); +$graph->xaxis->SetFont( FF_FONT1, FS_BOLD ); + +// Display the graph +$graph->Stroke(); +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pushpinex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pushpinex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pushpinex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pushpinex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,62 @@ +img->SetMargin(1,1,1,1); +$graph->SetScale('linlin',0,100,0,100); + +// We don't want any axis to be shown +$graph->xaxis->Hide(); +$graph->yaxis->Hide(); + +// Use a worldmap as the background and let it fill the plot area +$graph->SetBackgroundImage(WORLDMAP,BGIMG_FILLPLOT); + +// Setup a nice title with a striped bevel background +$graph->title->Set("Pushpin graph"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->SetColor('white'); +$graph->SetTitleBackground('darkgreen',TITLEBKG_STYLE1,TITLEBKG_FRAME_BEVEL); +$graph->SetTitleBackgroundFillStyle(TITLEBKG_FILLSTYLE_HSTRIPED,'blue','darkgreen'); + +// Finally create the scatterplot +$sp = new ScatterPlot($datay,$datax); + +// We want the markers to be an image +$sp->mark->SetType(MARK_IMG_PUSHPIN,'blue',0.6); + +// Install the Y-X callback for the markers +$sp->mark->SetCallbackYX('markCallback'); + +// ... and add it to the graph +$graph->Add($sp); + +// .. and output to browser +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pushpinex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pushpinex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/pushpinex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/pushpinex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,63 @@ +img->SetMargin(1,1,1,1); +$graph->SetScale('linlin',0,100,0,100); + +// We don't want any axis to be shown +$graph->xaxis->Hide(); +$graph->yaxis->Hide(); + +// Use a worldmap as the background and let it fill the plot area +$graph->SetBackgroundImage(WORLDMAP,BGIMG_FILLPLOT); + +// Setup a nice title with a striped bevel background +$graph->title->Set("Pushpin graph"); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->SetColor('white'); +$graph->SetTitleBackground('darkgreen',TITLEBKG_STYLE1,TITLEBKG_FRAME_BEVEL); +$graph->SetTitleBackgroundFillStyle(TITLEBKG_FILLSTYLE_HSTRIPED,'blue','darkgreen'); + +// Finally create the lineplot +$lp = new LinePlot($datay,$datax); +$lp->SetColor('lightgray'); + +// We want the markers to be an image +$lp->mark->SetType(MARK_IMG_PUSHPIN,'blue',0.6); + +// Install the Y-X callback for the markers +$lp->mark->SetCallbackYX('markCallback'); + +// ... and add it to the graph +$graph->Add($lp); + +// .. and output to browser +$graph->Stroke(); + +?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample00.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample00.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample00.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample00.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,16 @@ +Stroke($data); +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,19 @@ +SetModuleWidth(5); + +// .. send the barcode back to the browser for the data +$backend->Stroke($data); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +SetModuleWidth(5); + + // .. send the barcode back to the browser for the data + $backend->Stroke($data); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,27 @@ +SetModuleWidth(5); + + // Store the barcode in the specifed file + $backend->Stroke($data,$fileName); + list($version,$errorcorrection) = $backend->GetQRInfo(); + + echo "QR Barcode, (Version: $version-$errorcorrection), image stored in file $fileName"; +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample03.png and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample03.png differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample04.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample04.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample04.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample04.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,24 @@ +SetModuleWidth(3); + + // Store the barcode in the specifed file + $backend->Stroke($data); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample05.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample05.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample05.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample05.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,29 @@ +SetModuleWidth(4); + + // Store the barcode in the specifed file + $backend->Stroke($data); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample06.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample06.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample06.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample06.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,26 @@ +SetImgFormat('jpeg',80); + + // Set the module size + $backend->SetModuleWidth(4); + + // Store the barcode in the specifed file + $backend->Stroke($data); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample07.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample07.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample07.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample07.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,26 @@ +SetModuleWidth(4); + + // Store the barcode in the specifed file + $backend->Stroke($data); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample08.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample08.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample08.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample08.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,22 @@ +SetModuleWidth(5); + + // .. send the barcode back to the browser for the data in the file + $backend->StrokeFromFile($readFromFilename); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample09.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample09.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample09.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample09.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,25 @@ +SetModuleWidth(5); + + // Use blue and white colors instead + $backend->SetColor('navy','white'); + + // .. send the barcode back to the browser for the data in the file + $backend->StrokeFromFile($readFromFilename); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +Stroke($data); +} catch (Exception $e) { + $errstr = $e->GetMessage(); + echo 'QR Code error: '.$e->GetMessage()."\n"; + exit(1); +} + +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample10.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample10.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample10.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample10.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,26 @@ +SetModuleWidth(3); + + // Set color + $backend->SetColor('brown','white'); + + // Store the barcode in the specifed file + $backend->Stroke($data); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample11.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample11.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample11.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample11.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,26 @@ +SetModuleWidth($modulewidth); + +// Store the barcode in the specifed file +$ps_str = $backend->Stroke($data); + +echo '
'.$ps_str.'
'; +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample12.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample12.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample12.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qrexample12.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,26 @@ +SetModuleWidth($modulewidth); + +// Store the barcode in the specifed file +$ps_str = $backend->Stroke($data); + +echo '
'.$ps_str.'
'; +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qr-input.txt smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qr-input.txt --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qr-input.txt 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qr-input.txt 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1 @@ +01234567890 \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qr_template.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qr_template.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/qr_template.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/qr_template.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,32 @@ +SetModuleWidth($modulewidth); + +// Set Quiet zone (this should rarely need changing from the default) +$backend->SetQuietZone($quiet); + +if( $back == BACKEND_IMAGE ) { + + $backend->Stroke($data); +} +else { + $str = $backend->Stroke($data); + echo '
'.$str.'
'; +} +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radar_csimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radar_csimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radar_csimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radar_csimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,43 @@ +title->Set('Radar with marks'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetMargin(10); + +$graph->SetTitles($titles); +$graph->SetCenter(0.5,0.55); +$graph->HideTickMarks(); +$graph->SetColor('lightgreen@0.7'); +$graph->axis->SetColor('darkgray'); +$graph->grid->SetColor('darkgray'); +$graph->grid->Show(); + +$graph->axis->title->SetFont(FF_ARIAL,FS_NORMAL,12); +$graph->axis->title->SetMargin(5); +$graph->SetGridDepth(DEPTH_BACK); +$graph->SetSize(0.6); + +$plot = new RadarPlot($data); +$plot->SetColor('red@0.2'); +$plot->SetLineWeight(2); +$plot->SetFillColor('red@0.7'); +$plot->mark->SetType(MARK_IMG_DIAMOND,'red',0.6); +$plot->mark->SetFillColor('darkred'); +$plot->SetCSIMTargets( $targets , $alts ); + +$graph->Add($plot); +$graph->StrokeCSIM(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,16 @@ +Add($plot); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +title->Set('Weekly goals'); +$graph->subtitle->Set('Year 2003'); + +$plot = new RadarPlot($data); +$plot->SetFillColor('lightred'); +$graph->SetSize(0.6); +$graph->SetPos(0.5,0.6); +// Add the plot and display the graph +$graph->Add($plot); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +GetShortMonth(); +$graph->SetTitles($titles); + +$plot = new RadarPlot($data); +$plot->SetFillColor('lightblue'); + +// Add the plot and display the graph +$graph->Add($plot); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,28 @@ +SetShadow(); + +// Create the titles for the axis +$titles = $gDateLocale->GetShortMonth(); +$graph->SetTitles($titles); + +// Add grid lines +$graph->grid->Show(); +$graph->grid->SetLineStyle('dashed'); + +$plot = new RadarPlot($data); +$plot->SetFillColor('lightblue'); + +// Add the plot and display the graph +$graph->Add($plot); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,26 @@ +GetShortMonth(); +$graph->SetTitles($titles); + +// Add grid lines +$graph->grid->Show(); +$graph->grid->SetColor('darkred'); +$graph->grid->SetLineStyle('dotted'); + +$plot = new RadarPlot($data); +$plot->SetFillColor('lightblue'); + +// Add the plot and display the graph +$graph->Add($plot); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex6.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex6.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex6.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex6.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,45 @@ +SetShadow(); + +// Create the titles for the axis +$titles = $gDateLocale->GetShortMonth(); +$graph->SetTitles($titles); +$graph->SetColor('lightyellow'); + +// ADjust the position to make more room +// for the legend +$graph->SetCenter(0.4,0.55); +$graph->SetSize(0.6); + +// Add grid lines +$graph->grid->Show(); +$graph->grid->SetColor('darkred'); +$graph->grid->SetLineStyle('dotted'); + +$plot = new RadarPlot($data); +$plot->SetFillColor('lightblue'); +$plot->SetLegend("QA results"); + +$plot2 = new RadarPlot($data2); +$plot2->SetLegend("Target"); +$plot2->SetColor('red'); +$plot2->SetFill(false); +$plot2->SetLineWeight(2); + + +// Add the plot and display the graph +$graph->Add($plot); +$graph->Add($plot2); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,35 @@ +SetShadow(); + +// Create the titles for the axis +$titles = $gDateLocale->GetShortMonth(); +$graph->SetTitles($titles); +$graph->SetColor('lightyellow'); + +// ADjust the position to make more room +// for the legend +$graph->SetCenter(0.45,0.5); + +// Add grid lines +$graph->grid->Show(); +$graph->grid->SetColor('darkred'); +$graph->grid->SetLineStyle('dashed'); + +$plot = new RadarPlot($data); +$plot->SetFillColor('lightblue'); +$plot->SetLegend("QA results"); + +// Add the plot and display the graph +$graph->Add($plot); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +SetColor("white"); +$graph->SetShadow(); + +// Position the graph +$graph->SetCenter(0.4,0.55); + +// Setup the axis formatting +$graph->axis->SetFont(FF_FONT1,FS_BOLD); +$graph->axis->SetWeight(2); + +// Setup the grid lines +$graph->grid->SetLineStyle("longdashed"); +$graph->grid->SetColor("navy"); +$graph->grid->Show(); +$graph->HideTickMarks(); + +// Setup graph titles +$graph->title->Set("Quality result"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->SetTitles(array("One","Two","Three","Four","Five","Sex","Seven","Eight","Nine","Ten")); +// Create the first radar plot +$plot = new RadarPlot(array(30,80,60,40,71,81,47)); +$plot->SetLegend("Goal"); +$plot->SetColor("red","lightred"); +$plot->SetFill(false); +$plot->SetLineWeight(2); + +// Create the second radar plot +$plot2 = new RadarPlot(array(70,40,30,80,31,51,14)); +$plot2->SetLegend("Actual"); +$plot2->SetColor("blue","lightred"); + +// Add the plots to the graph +$graph->Add($plot2); +$graph->Add($plot); + +// And output the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex8.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex8.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex8.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex8.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,52 @@ +img->SetAntiAliasing(); + +// Set background color and shadow +$graph->SetColor("white"); +$graph->SetShadow(); + +// Position the graph +$graph->SetCenter(0.4,0.55); + +// Setup the axis formatting +$graph->axis->SetFont(FF_FONT1,FS_BOLD); + +// Setup the grid lines +$graph->grid->SetLineStyle("solid"); +$graph->grid->SetColor("navy"); +$graph->grid->Show(); +$graph->HideTickMarks(); + +// Setup graph titles +$graph->title->Set("Quality result"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$graph->SetTitles($gDateLocale->GetShortMonth()); + +// Create the first radar plot +$plot = new RadarPlot(array(70,80,60,90,71,81,47)); +$plot->SetLegend("Goal"); +$plot->SetColor("red","lightred"); +$plot->SetFill(false); +$plot->SetLineWeight(2); + +// Create the second radar plot +$plot2 = new RadarPlot(array(70,40,30,80,31,51,14)); +$plot2->SetLegend("Actual"); +$plot2->SetLineWeight(2); +$plot2->SetColor("blue"); +$plot2->SetFill(false); + +// Add the plots to the graph +$graph->Add($plot2); +$graph->Add($plot); + +// And output the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex8.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex8.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex8.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex8.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ +img->SetAntiAliasing(); + +// Set background color and shadow +$graph->SetColor("white"); +$graph->SetShadow(); + +// Position the graph +$graph->SetCenter(0.4,0.55); + +// Setup the axis formatting +$graph->axis->SetFont(FF_FONT1,FS_BOLD); + +// Setup the grid lines +$graph->grid->SetLineStyle("solid"); +$graph->grid->SetColor("navy"); +$graph->grid->Show(); +$graph->HideTickMarks(); + +// Setup graph titles +$graph->title->Set("Quality result"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->SetTitles($gDateLocale->GetShortMonth()); + +// Create the first radar plot +$plot = new RadarPlot(array(70,80,60,90,71,81,47)); +$plot->SetLegend("Goal"); +$plot->SetColor("red","lightred"); +$plot->SetFill(false); +$plot->SetLineWeight(2); + +// Create the second radar plot +$plot2 = new RadarPlot(array(70,40,30,80,31,51,14)); +$plot2->SetLegend("Actual"); +$plot2->SetLineWeight(2); +$plot2->SetColor("blue"); +$plot2->SetFill(false); + +// Add the plots to the graph +$graph->Add($plot2); +$graph->Add($plot); + +// And output the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex9.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex9.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarex9.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarex9.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ +title->Set("Accumulated PPM"); +$graph->title->SetFont(FF_VERDANA,FS_NORMAL,12); + +$graph->subtitle->Set("(according to direction)"); +$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10); + + +$graph->SetTitles($titles); +$graph->SetCenter(0.5,0.55); +$graph->HideTickMarks(); +$graph->SetColor('lightyellow'); +$graph->axis->SetColor('darkgray@0.3'); +$graph->grid->SetColor('darkgray@0.3'); +$graph->grid->Show(); + +$graph->SetGridDepth(DEPTH_BACK); + +$plot = new RadarPlot($data); +$plot->SetColor('red@0.2'); +$plot->SetLineWeight(1); +$plot->SetFillColor('red@0.7'); +$graph->Add($plot); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex1-aa.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex1-aa.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex1-aa.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex1-aa.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,60 @@ +SetScale('log'); + +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->Set('Logarithmic scale'); +$graph->title->SetMargin(10); + +// Make the radar graph fill out it's bounding box +$graph->SetPlotSize(0.8); +$graph->SetCenter(0.5,0.55); + +// Note: Enabling this results in a very noticable slow +// down of the image generation! And more load on your +// server. +$graph->img->SetAntiAliasing(); + +// Uncomment the following line if you want to supress +// minor tick marks +//$graph->yscale->ticks->SupressMinorTickMarks(); + +// We want the major tick marks to be black and minor +// slightly less noticable +$graph->yscale->ticks->SetMarkColor('black','darkgray'); + +// Set the axis title font +$graph->axis->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->axis->title->SetColor('darkred:0.8'); + +// Use blue axis +$graph->axis->SetColor('blue'); + +$plot = new RadarPlot($data); +$plot->SetLineWeight(1); +$plot->SetColor('forestgreen'); +$plot->SetFillColor('forestgreen@0.9'); + +$plot2 = new RadarPlot($data2); +$plot2->SetLineWeight(2); +$plot2->SetColor('red'); +$plot2->SetFillColor('red@0.9'); + +// Add the plot and display the graph +$graph->Add($plot); +$graph->Add($plot2); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,55 @@ +SetScale('log'); + +$graph->title->SetFont(FF_ARIAL,FS_BOLD,16); +$graph->title->Set('Logarithmic scale'); +$graph->title->SetMargin(10); + +// Make the radar graph fill out it's bounding box +$graph->SetPlotSize(0.8); +$graph->SetCenter(0.5,0.55); + +// Uncomment the following line if you want to supress +// minor tick marks +//$graph->yscale->ticks->SupressMinorTickMarks(); + +// We want the major tick marks to be black and minor +// slightly less noticable +$graph->yscale->ticks->SetMarkColor('black','darkgray'); + +// Set the axis title font +$graph->axis->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->axis->title->SetColor('darkred:0.8'); + +// Use blue axis +$graph->axis->SetColor('blue'); + +$plot = new RadarPlot($data); +$plot->SetLineWeight(1); +$plot->SetColor('forestgreen'); +$plot->SetFillColor('forestgreen@0.9'); + +$plot2 = new RadarPlot($data2); +$plot2->SetLineWeight(2); +$plot2->SetColor('red'); +$plot2->SetFillColor('red@0.9'); + +// Add the plot and display the graph +$graph->Add($plot); +$graph->Add($plot2); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarlogex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,47 @@ +img->SetAntiAliasing(); + +// Make the spider graph fill out it's bounding box +$graph->SetPlotSize(0.85); + +// Use logarithmic scale (If you don't use any SetScale() +// the spider graph will default to linear scale +$graph->SetScale("log"); + +// Uncomment the following line if you want to supress +// minor tick marks +// $graph->yscale->ticks->SupressMinorTickMarks(); + +// We want the major tick marks to be black and minor +// slightly less noticable +$graph->yscale->ticks->SetMarkColor("black","darkgray"); + +// Set the axis title font +$graph->axis->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// Use blue axis +$graph->axis->SetColor("blue"); + +$plot = new RadarPlot($data); +$plot->SetLineWeight(2); +$plot->SetColor('forestgreen'); + +// Add the plot and display the graph +$graph->Add($plot); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarmarkex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarmarkex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/radarmarkex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/radarmarkex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,35 @@ +title->Set('Radar with marks'); +$graph->title->SetFont(FF_VERDANA,FS_NORMAL,12); + +$graph->SetTitles($titles); +$graph->SetCenter(0.5,0.55); +$graph->HideTickMarks(); +$graph->SetColor('lightgreen@0.7'); +$graph->axis->SetColor('darkgray'); +$graph->grid->SetColor('darkgray'); +$graph->grid->Show(); + +$graph->axis->title->SetFont(FF_ARIAL,FS_NORMAL,12); +$graph->axis->title->SetMargin(5); +$graph->SetGridDepth(DEPTH_BACK); +$graph->SetSize(0.6); + +$plot = new RadarPlot($data); +$plot->SetColor('red@0.2'); +$plot->SetLineWeight(1); +$plot->SetFillColor('red@0.7'); + +$plot->mark->SetType(MARK_IMG_SBALL,'red'); + +$graph->Add($plot); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rose_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rose_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rose_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rose_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,57 @@ + array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ), + 1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ), + 2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ), + 3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ), + 4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ), + 5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ), + 6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ), + 7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ), + 8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ), +); + +// Create the graph. These two calls are always required +$graph = new Graph(400,300); + +$graph->SetScale("textlin"); +if ($theme) { + $graph->SetTheme(new $theme()); +} +$theme_class = new RoseTheme; +$graph->SetTheme($theme_class); + +$plot = array(); +// Create the bar plots +for ($i = 0; $i < 4; $i++) { + $plot[$i] = new BarPlot($data[$i]); + $plot[$i]->SetLegend('plot'.($i+1)); +} +//$acc1 = new AccBarPlot(array($plot[0], $plot[1])); +//$acc1->value->Show(); +$gbplot = new GroupBarPlot(array($plot[2], $plot[1] )); + +for ($i = 4; $i < 8; $i++) { + $plot[$i] = new LinePlot($data[$i]); + $plot[$i]->SetLegend('plot'.$i); + $plot[$i]->value->Show(); +} + +$graph->Add($gbplot); +$graph->Add($plot[4]); + +$title = "RoseTheme Example"; +$title = mb_convert_encoding($title,'UTF-8'); +$graph->title->Set($title); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +// Display the graph +$graph->Stroke(); +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rose.gif and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rose.gif differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotateex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotateex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotateex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotateex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,47 @@ +clearTheme(); +$graph->SetAngle(40); +$graph->img->SetMargin(80,80,80,80); +$graph->SetScale("textlin"); +$graph->SetY2Scale("lin"); +$graph->SetShadow(); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot2=new LinePlot($y2data); + +// Add the plot to the graph +$graph->Add($lineplot); +$graph->AddY2($lineplot2); +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); +$graph->y2axis->SetColor("orange"); + +$graph->title->Set("Example 1 rotated graph (40 degree)"); +$graph->legend->Pos(0.05,0.1,"right","top"); + +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->yaxis->title->SetFont(FF_FONT1,FS_BOLD); +$graph->xaxis->title->SetFont(FF_FONT1,FS_BOLD); + +$lineplot->SetColor("blue"); +$lineplot->SetWeight(2); + +$lineplot2->SetColor("orange"); +$lineplot2->SetWeight(2); + +$graph->yaxis->SetColor("blue"); + +$lineplot->SetLegend("Plot 1"); +$lineplot2->SetLegend("Plot 2"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +clearTheme(); +$graph->SetMargin(30,90,30,30); +$graph->SetScale("textlin"); + +$line = new LinePlot($ydata); +$line->SetLegend('2002'); +$line->SetColor('darkred'); +$line->SetWeight(2); +$graph->Add($line); + +// Output graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +clearTheme(); +$graph->SetMargin(30,90,30,30); +$graph->SetScale("textlin"); + +$graph->img->SetAngle(45); + +$line = new LinePlot($ydata); +$line->SetLegend('2002'); +$line->SetColor('darkred'); +$line->SetWeight(2); +$graph->Add($line); + +// Output graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +clearTheme(); +$graph->SetMargin(30,90,30,30); +$graph->SetScale("textlin"); + +$graph->img->SetAngle(90); + +$line = new LinePlot($ydata); +$line->SetLegend('2002'); +$line->SetColor('darkred'); +$line->SetWeight(2); +$graph->Add($line); + +// Output graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,24 @@ +clearTheme(); +$graph->SetMargin(30,90,30,30); +$graph->SetScale("textlin"); + +$graph->img->SetAngle(45); +$graph->img->SetCenter(floor(270/2),floor(170/2)); + +$line = new LinePlot($ydata); +$line->SetLegend('2002'); +$line->SetColor('darkred'); +$line->SetWeight(2); +$graph->Add($line); + +// Output graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,24 @@ +clearTheme(); +$graph->SetMargin(30,90,30,30); +$graph->SetScale("textlin"); + +$graph->img->SetAngle(90); +$graph->img->SetCenter(floor(270/2),floor(170/2)); + +$line = new LinePlot($ydata); +$line->SetLegend('2002'); +$line->SetColor('darkred'); +$line->SetWeight(2); +$graph->Add($line); + +// Output graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/rotex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/rotex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,24 @@ +clearTheme(); +$graph->SetMargin(30,90,30,30); +$graph->SetScale("textlin"); + +$graph->img->SetAngle(-30); +$graph->img->SetCenter(30,170-30); + +$line = new LinePlot($ydata); +$line->SetLegend('2002'); +$line->SetColor('darkred'); +$line->SetWeight(2); +$graph->Add($line); + +// Output graph +$graph->Stroke(); + +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/saab_95.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/saab_95.jpg differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatter_csimex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatter_csimex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatter_csimex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatter_csimex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,44 @@ +SetShadow(); +$graph->SetScale("linlin"); + +//$graph->img->SetMargin(40,40,40,40); + +$graph->title->Set("Scatter plot with Image Map"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Client side image map targets +$targ=array("pie_csimex1.php#1","pie_csimex1.php#2","pie_csimex1.php#3", +"pie_csimex1.php#4","pie_csimex1.php#5","pie_csimex1.php#6", +"pie_csimex1.php#7","pie_csimex1.php#8","pie_csimex1.php#9" ); + +// Strings to put as "alts" (and "title" value) +$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); + +// Create a new scatter plot +$sp1 = new ScatterPlot($datay,$datax); + +// Use diamonds as markerss +$sp1->mark->SetType(MARK_DIAMOND); +$sp1->mark->SetWidth(10); + +// Set the scatter plot image map targets +$sp1->SetCSIMTargets($targ,$alts); + +// Add the plot +$graph->Add($sp1); + +// Send back the HTML page which will call this script again +// to retrieve the image. +$graph->StrokeCSIM(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +clearTheme(); +$graph->SetScale("linlin"); + +$graph->img->SetMargin(40,40,40,40); +$graph->SetShadow(); + +$graph->title->Set("A simple scatter plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$sp1 = new ScatterPlot($datay,$datax); + +$graph->Add($sp1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,26 @@ +clearTheme(); +$graph->SetScale("linlin"); + +$graph->img->SetMargin(40,40,40,40); +$graph->SetShadow(); + +$graph->title->Set("A simple scatter plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$sp1 = new ScatterPlot($datay,$datax); +$sp1->mark->SetType(MARK_FILLEDCIRCLE); +$sp1->mark->SetFillColor("red"); +$sp1->mark->SetWidth(8); + +$graph->Add($sp1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,25 @@ +clearTheme(); +$graph->img->SetMargin(40,40,40,40); +$graph->img->SetAntiAliasing(); +$graph->SetScale("linlin"); +$graph->SetShadow(); +$graph->title->Set("Linked Scatter plot ex1"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +$sp1 = new ScatterPlot($datay,$datax); +$sp1->SetLinkPoints(true,"red",2); +$sp1->mark->SetType(MARK_FILLEDCIRCLE); +$sp1->mark->SetFillColor("navy"); +$sp1->mark->SetWidth(3); + +$graph->Add($sp1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +clearTheme(); +$graph->SetScale("linlin"); + +$graph->img->SetMargin(40,40,40,40); + +$graph->SetShadow(); +$graph->title->Set("Linked scatter plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// 10% top and bottom grace +$graph->yscale->SetGrace(5,5); +$graph->xscale->SetGrace(1,1); + +$sp1 = new ScatterPlot($datay,$datax); +$sp1->mark->SetType(MARK_FILLEDCIRCLE); +$sp1->mark->SetFillColor("red"); +$sp1->SetColor("blue"); + +//$sp1->SetWeight(3); +$sp1->mark->SetWidth(4); +$sp1->SetLinkPoints(); + +$graph->Add($sp1); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,44 @@ +clearTheme(); +$graph->SetScale('linlin'); +$graph->SetShadow(); +$graph->SetAxisStyle(AXSTYLE_BOXOUT); + +$graph->img->SetMargin(50,50,60,40); + +$graph->title->Set('Linked scatter plot'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->subtitle->Set('(BOXOUT Axis style)'); +$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL); + + +// 10% top and bottom grace +$graph->yscale->SetGrace(5,5); +$graph->xscale->SetGrace(1,1); + +$sp1 = new ScatterPlot($datay,$datax); +$sp1->mark->SetType(MARK_FILLEDCIRCLE); +$sp1->mark->SetFillColor('red'); +$sp1->SetColor('blue'); + +$sp1->mark->SetWidth(4); +$sp1->link->Show(); +$sp1->link->SetStyle('dotted'); + +$graph->Add($sp1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterlinkex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,44 @@ +clearTheme(); +$graph->SetScale('linlin'); +$graph->SetShadow(); +$graph->SetAxisStyle(AXSTYLE_BOXIN); + +$graph->img->SetMargin(50,50,60,40); + +$graph->title->Set('Linked scatter plot'); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->subtitle->Set('(BOXIN Axis style)'); +$graph->subtitle->SetFont(FF_FONT1,FS_NORMAL); + +// 10% top and bottom grace +$graph->yscale->SetGrace(5,5); +$graph->xscale->SetGrace(1,1); + +$sp1 = new ScatterPlot($datay,$datax); +$sp1->mark->SetType(MARK_FILLEDCIRCLE); +$sp1->mark->SetFillColor('red'); +$sp1->SetColor('blue'); + +$sp1->mark->SetWidth(4); +$sp1->link->Show(); +$sp1->link->SetWeight(2); +$sp1->link->SetColor('red@0.7'); + + +$graph->Add($sp1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterrotex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterrotex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/scatterrotex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/scatterrotex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,36 @@ +clearTheme(); +$graph->SetScale("linlin"); + +$graph->Set90AndMargin(40,40,40,40); +$graph->SetShadow(); + +$graph->title->Set("A 90 degrees rotated scatter plot"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Adjust the label align for X-axis so they look good rotated +$graph->xaxis->SetLabelAlign('right','center','right'); + +// Adjust the label align for Y-axis so they look good rotated +$graph->yaxis->SetLabelAlign('center','bottom'); + +$graph->xaxis->SetTitle('X-Axis title','low'); +$graph->xaxis->title->SetAngle(90); +$graph->xaxis->title->SetMargin(15); + +$sp1 = new ScatterPlot($datay,$datax); +$sp1->mark->SetType(MARK_FILLEDCIRCLE); +$sp1->mark->SetFillColor("red"); +$sp1->mark->SetWidth(5); + +$graph->Add($sp1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/show-example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/show-example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/show-example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/show-example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,24 @@ + + + + + Test suite for JpGraph - <?php echo $target; ?> + + + + "; + else + echo ""; + ?> + + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/show-image.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/show-image.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/show-image.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/show-image.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,10 @@ + + + + + Image <?php echo basename($target); ?> + + +<?php echo basename($target); ?> + + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/show-source.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/show-source.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/show-source.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/show-source.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1 @@ + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex10.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex10.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex10.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex10.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,20,20); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_DIAGCROSS,15,35,'khaki4'); +$band->ShowFrame(false); +$graph->Add($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_DIAGCROSS'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex11.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex11.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex11.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex11.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,20,20); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_DIAGCROSS,15,35,'khaki4'); +$band->ShowFrame(false); +$graph->Add($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_DIAGCROSS'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,20,20); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_RDIAG,15,35,'khaki4'); +$band->ShowFrame(false); +$graph->Add($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_RDIAG'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,20,20); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_LDIAG,15,35,'khaki4'); +$band->ShowFrame(false); +$graph->Add($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_LDIAG'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,20,20); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_SOLID,15,35,'khaki4'); +$band->ShowFrame(false); +$graph->Add($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_SOLID'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,20,20); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_3DPLANE,15,35,'khaki4'); +$band->SetDensity(80); +$band->ShowFrame(true); +$graph->Add($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_3DPLANE, Density=60'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,20,20); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_HVCROSS,15,35,'khaki4'); +$band->ShowFrame(true); +$band->SetOrder(DEPTH_FRONT); +$graph->Add($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_HVCROSS, In front'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,20,20); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_VLINE,15,35,'khaki4'); +$band->ShowFrame(false); +$graph->Add($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_VLINE'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,20,20); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_HLINE,15,35,'khaki4'); +$band->ShowFrame(false); +$graph->Add($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_HLINE'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex8.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex8.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex8.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex8.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,20,20); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_3DPLANE,15,35,'khaki4'); +$band->ShowFrame(false); +$graph->Add($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_3DPLANE'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex9.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex9.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex9.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/smallstaticbandsex9.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,41 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,20,20); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("lightblue"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +$graph->ygrid->Show(false); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$band = new PlotBand(HORIZONTAL,BAND_HVCROSS,15,35,'khaki4'); +$band->ShowFrame(false); +$graph->Add($band); + +// Set title +$graph->title->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->title->SetColor('darkred'); +$graph->title->Set('BAND_HVCROSS'); + + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/softy_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/softy_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/softy_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/softy_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ + array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ), + 1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ), + 2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ), + 3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ), + 4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ), + 5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ), + 6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ), + 7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ), + 8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ), +); + + +// Create the graph. These two calls are always required +$graph = new Graph(400,300); + +$graph->SetScale("textlin"); +if ($theme) { + $graph->SetTheme(new $theme()); +} +$theme_class = new SoftyTheme; +$graph->SetTheme($theme_class); + +$plot = array(); +// Create the bar plots +for ($i = 0; $i < 4; $i++) { + $plot[$i] = new BarPlot($data[$i]); + $plot[$i]->SetLegend('plot'.($i+1)); +} +//$acc1 = new AccBarPlot(array($plot[0], $plot[1])); +//$acc1->value->Show(); +$gbplot = new GroupBarPlot(array($plot[2], $plot[1] )); + +for ($i = 4; $i < 8; $i++) { + $plot[$i] = new LinePlot($data[$i]); + $plot[$i]->SetLegend('plot'.$i); + $plot[$i]->value->Show(); +} + +$graph->Add($gbplot); +$graph->Add($plot[4]); + +$title = "SoftyTheme Example"; +$title = mb_convert_encoding($title,'UTF-8'); +$graph->title->Set($title); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/splineex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/splineex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/splineex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/splineex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,56 @@ +Get(50); + +// Create the graph +$g = new Graph(300,200); +$g->clearTheme(); +$g->SetMargin(30,20,40,30); +$g->title->Set("Natural cubic splines"); +$g->title->SetFont(FF_ARIAL,FS_NORMAL,12); +$g->subtitle->Set('(Control points shown in red)'); +$g->subtitle->SetColor('darkred'); +$g->SetMarginColor('lightblue'); + +//$g->img->SetAntiAliasing(); + +// We need a linlin scale since we provide both +// x and y coordinates for the data points. +$g->SetScale('linlin'); + +// We want 1 decimal for the X-label +$g->xaxis->SetLabelFormat('%1.1f'); + +// We use a scatterplot to illustrate the original +// contro points. +$splot = new ScatterPlot($ydata,$xdata); + +// +$splot->mark->SetFillColor('red@0.3'); +$splot->mark->SetColor('red@0.5'); + +// And a line plot to stroke the smooth curve we got +// from the original control points +$lplot = new LinePlot($newy,$newx); +$lplot->SetColor('navy'); + +// Add the plots to the graph and stroke +$g->Add($lplot); +$g->Add($splot); +$g->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +clearTheme(); +$graph->img->SetMargin(60,30,50,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +$graph->title->SetFont(FF_ARIAL,FS_BOLD,15); +$graph->title->Set("Cash flow "); +$graph->subtitle->Set("(Department X)"); + +// Show both X and Y grid +$graph->xgrid->Show(true,false); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10,10); + +// Turn the tick mark out from the plot area +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); + +// Show the actual value for each bar on top/bottom +$bplot->value->Show(true); +$bplot->value->SetFormat("%02d kr"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$graph->Add(new PlotBand(HORIZONTAL,BAND_HLINE,0,10)); + +//$graph->title->Set("Test of bar gradient fill"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); +$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +clearTheme(); +$graph->img->SetMargin(60,30,50,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +$graph->title->SetFont(FF_ARIAL,FS_BOLD,15); +$graph->title->Set("Cash flow "); +$graph->subtitle->Set("(Department X)"); + +// Show both X and Y grid +$graph->xgrid->Show(true,false); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10,10); + +// Turn the tick mark out from the plot area +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); + +// Show the actual value for each bar on top/bottom +$bplot->value->Show(true); +$bplot->value->SetFormat("%02d kr"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add band +$graph->Add(new PlotBand(HORIZONTAL,BAND_RDIAG,0,"max","red",2)); + +//$graph->title->Set("Test of bar gradient fill"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); +$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,59 @@ +clearTheme(); +$graph->img->SetMargin(60,30,50,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +$graph->title->SetFont(FF_ARIAL,FS_BOLD,15); +$graph->title->Set("Cash flow "); +$graph->subtitle->Set("(Department X)"); + +// Show both X and Y grid +$graph->xgrid->Show(true,false); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10,10); + +// Turn the tick mark out from the plot area +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); + +// Show the actual value for each bar on top/bottom +$bplot->value->Show(true); +$bplot->value->SetFormat("%02d kr"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add upper and lower band and use no frames +$uband=new PlotBand(HORIZONTAL,BAND_RDIAG,0,"max","green"); +$uband->ShowFrame(false); +$lband=new PlotBand(HORIZONTAL,BAND_LDIAG,"min",0,"red"); +$lband->ShowFrame(false); + +$graph->Add($uband); +$graph->Add($lband); + +//$graph->title->Set("Test of bar gradient fill"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); +$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,61 @@ +clearTheme(); +$graph->img->SetMargin(60,30,50,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +$graph->title->SetFont(FF_ARIAL,FS_BOLD,15); +$graph->title->Set("Cash flow "); +$graph->subtitle->Set("(Department X)"); + +// Show both X and Y grid +$graph->xgrid->Show(true,false); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10,10); + +// Turn the tick mark out from the plot area +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); + +// Show the actual value for each bar on top/bottom +$bplot->value->Show(true); +$bplot->value->SetFormat("%02d kr"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add upper and lower band and use no frames +$uband=new PlotBand(HORIZONTAL,BAND_RDIAG,0,"max","green"); +$uband->ShowFrame(false); +$uband->SetDensity(50); // 50% line density +$lband=new PlotBand(HORIZONTAL,BAND_LDIAG,"min",0,"red"); +$lband->ShowFrame(false); +$lband->SetDensity(20); // 20% line density + +$graph->Add($uband); +$graph->Add($lband); + +//$graph->title->Set("Test of bar gradient fill"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); +$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,64 @@ +clearTheme(); +$graph->img->SetMargin(60,30,50,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +$graph->title->SetFont(FF_ARIAL,FS_BOLD,15); +$graph->title->Set("Cash flow "); +$graph->subtitle->Set("(Department X)"); + +// Show both X and Y grid +$graph->xgrid->Show(true,false); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10,10); + +// Turn the tick mark out from the plot area +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); + +// Show the actual value for each bar on top/bottom +$bplot->value->Show(true); +$bplot->value->SetFormat("%02d kr"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add upper and lower band and use no frames +$band[0]=new PlotBand(HORIZONTAL,BAND_RDIAG,10,20,"green"); +$band[0]->ShowFrame(false); +$band[0]->SetDensity(30); +$band[1]=new PlotBand(HORIZONTAL,BAND_LDIAG,-20,-10,"red"); +$band[1]->ShowFrame(false); +$band[1]->SetDensity(40); +$band[2]=new PlotBand(HORIZONTAL,BAND_LDIAG,"min",-20,"red"); +$band[2]->ShowFrame(false); +$band[2]->SetDensity(80); + +// We can also add band in an array +$graph->Add($band); + +//$graph->title->Set("Test of bar gradient fill"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); +$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,74 @@ +clearTheme(); +$graph->img->SetMargin(60,30,50,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +$graph->title->SetFont(FF_ARIAL,FS_BOLD,15); +$graph->title->Set("Cash flow "); +$graph->subtitle->Set("Shows some possible patterns for bands"); + +// Show both X and Y grid +$graph->xgrid->Show(true,false); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10,10); + +// Turn the tick mark out from the plot area +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); +$bplot->SetShadow(); + +// Show the actual value for each bar on top/bottom +$bplot->value->Show(true); +$bplot->value->SetFormat("%02d kr"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add upper and lower band and use no frames +$band[0]=new PlotBand(HORIZONTAL,BAND_RDIAG,10,20,"green"); +$band[0]->ShowFrame(false); +$band[1]=new PlotBand(HORIZONTAL,BAND_LDIAG,-20,-10,"red"); +$band[1]->ShowFrame(false); +$band[1]->SetDensity(20); +$band[2]=new PlotBand(HORIZONTAL,BAND_DIAGCROSS,"min",-20,"red"); +$band[2]->ShowFrame(false); +$band[2]->SetDensity(40); +$band[3]=new PlotBand(VERTICAL,BAND_HLINE,0,1,"darkgray"); +$band[3]->ShowFrame(false); +$band[3]->SetOrder(DEPTH_FRONT); +$band[4]=new PlotBand(VERTICAL,BAND_HVCROSS,5,"max","darkgray"); +$band[4]->ShowFrame(false); +$band[4]->SetOrder(DEPTH_FRONT); +$band[5]=new PlotBand(HORIZONTAL,BAND_SOLID,20,"max","lightgreen"); +$band[6]=new PlotBand(HORIZONTAL,BAND_3DPLANE,-10,0,"blue"); +$band[6]->SetDensity(70); +$graph->Add($band); + +$graph->AddLine(new PlotLine(HORIZONTAL,0,"black",2)); + +//$graph->title->Set("Test of bar gradient fill"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); +$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticbandbarex7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,63 @@ +clearTheme(); +$graph->img->SetMargin(60,30,50,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +$graph->title->SetFont(FF_ARIAL,FS_BOLD,15); +$graph->title->Set("Cash flow "); +$graph->subtitle->Set("Use of static line, 3D and solid band"); + +// Turn off Y-grid (it's on by default) +$graph->ygrid->Show(false); + +// Add 10% grace ("space") at top of Y-scale. +$graph->yscale->SetGrace(10); +$graph->yscale->SetAutoMin(-20); + +// Turn the tick mark out from the plot area +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); +$bplot->SetShadow("darkblue"); + +// Show the actual value for each bar on top/bottom +$bplot->value->Show(true); +$bplot->value->SetFormat("%02d kr"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add upper and lower band and use no frames +$band[0]=new PlotBand(HORIZONTAL,BAND_3DPLANE,"min",0,"blue"); +$band[0]->ShowFrame(false); +$band[0]->SetDensity(20); +$band[1]=new PlotBand(HORIZONTAL,BAND_SOLID,0,"max","steelblue"); +$band[1]->ShowFrame(false); +$graph->Add($band); + +$graph->Add(new PlotLine(HORIZONTAL,0,"black",2)); + +//$graph->title->Set("Test of bar gradient fill"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); +$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticlinebarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticlinebarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/staticlinebarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/staticlinebarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,56 @@ +clearTheme(); +$graph->img->SetMargin(60,30,50,40); +$graph->SetScale("textlin"); +$graph->SetShadow(); + +$graph->title->SetFont(FF_ARIAL,FS_BOLD,15); +$graph->title->Set("Cash flow "); +$graph->subtitle->Set("(Department X)"); + +// Show both X and Y grid +$graph->xgrid->Show(true,false); + +// Add 10% grace ("space") at top and botton of Y-scale. +$graph->yscale->SetGrace(10,10); + +// Turn the tick mark out from the plot area +$graph->xaxis->SetTickSide(SIDE_DOWN); +$graph->yaxis->SetTickSide(SIDE_LEFT); + +// Create a bar pot +$bplot = new BarPlot($datay); +$bplot->SetFillColor("orange"); +$bplot->SetShadow(); + +// Show the actual value for each bar on top/bottom +$bplot->value->Show(); +$bplot->value->SetFormat("%02d kr"); + +// Position the X-axis at the bottom of the plotare +$graph->xaxis->SetPos("min"); + +// .. and add the plot to the graph +$graph->Add($bplot); + +// Add mark graph with static lines +$graph->AddLine(new PlotLine(HORIZONTAL,0,"black",2)); +$graph->AddLine(new PlotLine(VERTICAL,3,"black",2)); + +//$graph->title->Set("Test of bar gradient fill"); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +$graph->yaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); +$graph->xaxis->title->SetFont(FF_ARIAL,FS_BOLD,11); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/stockex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/stockex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/stockex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/stockex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +clearTheme(); +$graph->SetScale("textlin"); +$graph->SetMarginColor('lightblue'); +$graph->title->Set('Stockchart example'); + +// Create a new stock plot +$p1 = new StockPlot($datay); + +// Width of the bars (in pixels) +$p1->SetWidth(9); + +// Uncomment the following line to hide the horizontal end lines +//$p1->HideEndLines(); + +// Add the plot to the graph and send it back to the browser +$graph->Add($p1); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/stockex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/stockex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/stockex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/stockex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,39 @@ +SetScale("textlin"); +$graph->SetMarginColor('white'); +$graph->SetFrame(false); +$graph->ygrid->SetFill(true,'#EFEFEF@0.5','#BBCCFF@0.5'); +$graph->SetBox(); + +$graph->tabtitle->Set(' Week 34 '); +$graph->tabtitle->SetFont(FF_ARIAL,FS_NORMAL,12); + +// Get week days in curent locale +$days = $gDateLocale->GetShortDay(); +array_shift($days); // Start on monday +$graph->xaxis->SetTickLabels($days); + +// Create stock plot +$p1 = new StockPlot($datay); + +// Indent plot so first and last bar isn't on the edges +$p1->SetCenter(); + +// Add and stroke +$graph->Add($p1); +$graph->Stroke(); +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/stship.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/stship.jpg differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunflower.gif and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunflower.gif differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ + $datarow ) { + $split = preg_split('/[\s]+/',$datarow); + $aYears[] = substr(trim($split[0]),0,4); + $aSunspots[] = trim($split[1]); + } +} + +$year = array(); +$ydata = array(); +readsunspotdata('yearssn.txt',$year,$ydata); + + // Width and height of the graph +$width = 600; $height = 200; + +// Create a graph instance +$graph = new Graph($width,$height); + +// Specify what scale we want to use, +// int = integer scale for the X-axis +// int = integer scale for the Y-axis +$graph->SetScale('intint'); + +// Setup a title for the graph +$graph->title->Set('Sunspot example'); + +// Setup titles and X-axis labels +$graph->xaxis->title->Set('(year from 1701)'); + +// Setup Y-axis title +$graph->yaxis->title->Set('(# sunspots)'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,52 @@ + $datarow ) { + $split = preg_split('/[\s]+/',$datarow); + $aYears[] = substr(trim($split[0]),0,4); + $aSunspots[] = trim($split[1]); + } +} + +$year = array(); +$ydata = array(); +readsunspotdata('yearssn.txt',$year,$ydata); + + // Width and height of the graph +$width = 600; $height = 200; + +// Create a graph instance +$graph = new Graph($width,$height); + +// Specify what scale we want to use, +// int = integer scale for the X-axis +// int = integer scale for the Y-axis +$graph->SetScale('intint'); + +// Setup a title for the graph +$graph->title->Set('Sunspot example'); + +// Setup titles and X-axis labels +$graph->xaxis->title->Set('(year from 1701)'); + +// Setup Y-axis title +$graph->yaxis->title->Set('(# sunspots)'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetFillColor('orange@0.5'); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ + $datarow ) { + $split = preg_split('/[\s]+/',$datarow); + $aYears[] = substr(trim($split[0]),0,4); + $aSunspots[] = trim($split[1]); + } +} + +$year = array(); +$ydata = array(); +readsunspotdata('yearssn.txt',$year,$ydata); + + // Width and height of the graph +$width = 600; $height = 200; + +// Create a graph instance +$graph = new Graph($width,$height); + +// Specify what scale we want to use, +// int = integer scale for the X-axis +// int = integer scale for the Y-axis +$graph->SetScale('intint'); + +// Setup a title for the graph +$graph->title->Set('Sunspot example'); + +// Setup titles and X-axis labels +$graph->xaxis->title->Set('(year from 1701)'); +$graph->xaxis->SetTickLabels($year); + +// Setup Y-axis title +$graph->yaxis->title->Set('(# sunspots)'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetFillColor('orange@0.5'); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ + $datarow ) { + $split = preg_split('/[\s]+/',$datarow); + $aYears[] = substr(trim($split[0]),0,4); + $aSunspots[] = trim($split[1]); + } +} + +$year = array(); +$ydata = array(); +readsunspotdata('yearssn.txt',$year,$ydata); + + // Width and height of the graph +$width = 600; $height = 200; + +// Create a graph instance +$graph = new Graph($width,$height); + +// Specify what scale we want to use, +// int = integer scale for the X-axis +// int = integer scale for the Y-axis +$graph->SetScale('intint',0,0,0,max($year)-min($year)+1); + +// Setup a title for the graph +$graph->title->Set('Sunspot example'); + +// Setup titles and X-axis labels +$graph->xaxis->title->Set('(year from 1701)'); +$graph->xaxis->SetTickLabels($year); + +// Setup Y-axis title +$graph->yaxis->title->Set('(# sunspots)'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetFillColor('orange@0.5'); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,57 @@ + $datarow ) { + $split = preg_split('/[\s]+/',$datarow); + $aYears[] = substr(trim($split[0]),0,4); + $aSunspots[] = trim($split[1]); + } +} + +$year = array(); +$ydata = array(); +readsunspotdata('yearssn.txt',$year,$ydata); + +function year_callback($aLabel) { + return 1700+(int)$aLabel; +} + + // Width and height of the graph +$width = 600; $height = 200; + +// Create a graph instance +$graph = new Graph($width,$height); + +// Specify what scale we want to use, +// int = integer scale for the X-axis +// int = integer scale for the Y-axis +$graph->SetScale('intint'); + +// Setup a title for the graph +$graph->title->Set('Sunspot example'); + +// Setup titles and X-axis labels +$graph->xaxis->title->Set('(year from 1701)'); +$graph->xaxis->SetLabelFormatCallback('year_callback'); + +// Setup Y-axis title +$graph->yaxis->title->Set('(# sunspots)'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetFillColor('orange@0.5'); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,52 @@ + $datarow ) { + $split = preg_split('/[\s]+/',$datarow); + $aYears[] = substr(trim($split[0]),0,4); + $aSunspots[] = trim($split[1]); + } +} + +$year = array(); +$ydata = array(); +readsunspotdata('yearssn.txt',$year,$ydata); + + // Width and height of the graph +$width = 600; $height = 200; + +// Create a graph instance +$graph = new Graph($width,$height); + +// Specify what scale we want to use, +// int = integer scale for the X-axis +// int = integer scale for the Y-axis +$graph->SetScale('intint'); + +// Setup a title for the graph +$graph->title->Set('Sunspot example'); + +// Setup titles and X-axis labels +$graph->xaxis->title->Set('(year from 1701)'); + +// Setup Y-axis title +$graph->yaxis->title->Set('(# sunspots)'); + +// Create the bar plot +$barplot=new BarPlot($ydata); + +// Add the plot to the graph +$graph->Add($barplot); + +// Display the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/sunspotsex7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,56 @@ + $datarow ) { + $split = preg_split('/[\s]+/',$datarow); + $aYears[] = substr(trim($split[0]),0,4); + $aSunspots[] = trim($split[1]); + } +} + +$year = array(); +$ydata = array(); +readsunspotdata('yearssn.txt',$year,$ydata); + +// Just keep the last 20 values in the arrays +$year = array_slice($year, -20); +$ydata = array_slice($ydata, -20); + + // Width and height of the graph +$width = 600; $height = 200; + +// Create a graph instance +$graph = new Graph($width,$height); + +// Specify what scale we want to use, +// text = txt scale for the X-axis +// int = integer scale for the Y-axis +$graph->SetScale('textint'); + +// Setup a title for the graph +$graph->title->Set('Sunspot example'); + +// Setup titles and X-axis labels +$graph->xaxis->title->Set('(year)'); +$graph->xaxis->SetTickLabels($year); + +// Setup Y-axis title +$graph->yaxis->title->Set('(# sunspots)'); + +// Create the bar plot +$barplot=new BarPlot($ydata); + +// Add the plot to the graph +$graph->Add($barplot); + +// Display the graph +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tablebarex1_csim.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tablebarex1_csim.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tablebarex1_csim.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tablebarex1_csim.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,72 @@ +img->SetMargin($tablexpos,$rightmargin,30,$height-$tableypos); +$graph->SetScale("textlin"); +$graph->SetMarginColor('white'); + +// Setup titles and fonts +$graph->title->Set('Bar and table'); +$graph->title->SetFont(FF_VERDANA,FS_NORMAL,14); +$graph->yaxis->title->Set("Flow"); +$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,12); +$graph->yaxis->title->SetMargin(10); + +// Create the bars and the accbar plot +$bplot = new BarPlot($datay[3]); +$bplot->SetFillColor("orange"); +$bplot2 = new BarPlot($datay[2]); +$bplot2->SetFillColor("red"); +$bplot3 = new BarPlot($datay[1]); +$bplot3->SetFillColor("darkgreen"); +$accbplot = new AccBarPlot(array($bplot,$bplot2,$bplot3)); +$accbplot->value->Show(); +$graph->Add($accbplot); + +//Setup the table +$table = new GTextTable(); +$table->Set($datay); +$table->SetPos($tablexpos,$tableypos+1); + +$table->SetCellCSIMTarget(1,1,'tableex02.php','View details'); + +// Basic table formatting +$table->SetFont(FF_ARIAL,FS_NORMAL,10); +$table->SetAlign('right'); +$table->SetMinColWidth($cellwidth); +$table->SetNumberFormat('%0.1f'); + +// Format table header row +$table->SetRowFillColor(0,'teal@0.7'); +$table->SetRowFont(0,FF_ARIAL,FS_BOLD,11); +$table->SetRowAlign(0,'center'); + +// .. and add it to the graph +$graph->Add($table); + +$graph->StrokeCSIM(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tablebarex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tablebarex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tablebarex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tablebarex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,70 @@ +img->SetMargin($tablexpos,$rightmargin,30,$height-$tableypos); +$graph->SetScale("textlin"); +$graph->SetMarginColor('white'); + +// Setup titles and fonts +$graph->title->Set('Bar and table'); +$graph->title->SetFont(FF_VERDANA,FS_NORMAL,14); +$graph->yaxis->title->Set("Flow"); +$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,12); +$graph->yaxis->title->SetMargin(10); + +// Create the bars and the accbar plot +$bplot = new BarPlot($datay[3]); +$bplot->SetFillColor("orange"); +$bplot2 = new BarPlot($datay[2]); +$bplot2->SetFillColor("red"); +$bplot3 = new BarPlot($datay[1]); +$bplot3->SetFillColor("darkgreen"); +$accbplot = new AccBarPlot(array($bplot,$bplot2,$bplot3)); +$accbplot->value->Show(); +$graph->Add($accbplot); + +//Setup the table +$table = new GTextTable(); +$table->Set($datay); +$table->SetPos($tablexpos,$tableypos+1); + +// Basic table formatting +$table->SetFont(FF_ARIAL,FS_NORMAL,10); +$table->SetAlign('right'); +$table->SetMinColWidth($cellwidth); +$table->SetNumberFormat('%0.1f'); + +// Format table header row +$table->SetRowFillColor(0,'teal@0.7'); +$table->SetRowFont(0,FF_ARIAL,FS_BOLD,11); +$table->SetRowAlign(0,'center'); + +// .. and add it to the graph +$graph->Add($table); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex00.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex00.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex00.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex00.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,25 @@ +Set($data); + +//Add table to the graph +$graph->Add($table); + +// Send back table to the client +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex01_csim.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex01_csim.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex01_csim.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex01_csim.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ +Set($data); + +$table->SetCellCSIMTarget(1,1,'tableex02.php','View details'); + +$table->SetRowFont(0,FF_FONT1,FS_BOLD); +$table->SetRowColor(0,'navy'); +$table->SetRowFillColor(0,'lightgray'); + +$table->SetColFont(0,FF_FONT1,FS_BOLD); +$table->SetColColor(0,'navy'); +$table->SetColFillColor(0,'lightgray'); + +$graph->Add($table); + +$graph->StrokeCSIM(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,29 @@ +Init(); +$table->Set($data); + +$table->SetRowFont(0,FF_FONT1,FS_BOLD); +$table->SetRowColor(0,'navy'); +$table->SetRowFillColor(0,'lightgray'); + +$table->SetColFont(0,FF_FONT1,FS_BOLD); +$table->SetColColor(0,'navy'); +$table->SetColFillColor(0,'lightgray'); + +$graph->Add($table); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex02.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex02.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex02.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex02.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ +Init(); +$table->Set($data); + +// Setup row and column headers +$table->SetRowFont(0,FF_TIMES,FS_BOLD,11); +$table->SetRowAlign(0,'left','bottom'); +$table->SetRowColor(0,'navy'); +$table->SetRowFillColor(0,'lightgray'); +$table->SetColFont(0,FF_ARIAL,FS_BOLD,11); +$table->SetColColor(0,'navy'); +$table->SetColFillColor(0,'lightgray'); + +// Highlight cell 2,3 +$table->SetCellFillColor(2,3,'yellow'); + +$graph->Add($table); +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex03.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex03.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex03.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex03.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ +Init(); +$table->Set($data); +$table->SetBorder(2,'black'); + +// Setup top row with the year title +$table->MergeCells(0,0,0,6); +$table->SetRowFont(0,FF_ARIAL,FS_BOLD,16); +$table->SetRowColor(0,'navy'); +$table->SetRowAlign(0,'center'); + +// Setup quarter header +$table->MergeCells(1,1,1,3); +$table->MergeCells(1,4,1,6); +$table->SetRowAlign(1,'center'); +$table->SetRowFont(1,FF_ARIAL,FS_BOLD,10); +$table->SetRowColor(1,'navy'); +$table->SetRowFillColor(1,'lightgray'); +$table->SetRowGrid(2,'',0); // Turn off the gridline just under the top row + +// Setup row and column headers +$table->SetRowFont(2,FF_ARIAL,FS_NORMAL,11); +$table->SetRowColor(2,'navy'); +$table->SetRowFillColor(2,'lightgray'); + +$table->SetColFont(0,FF_ARIAL,FS_NORMAL,11); +$table->SetColColor(0,'navy'); +$table->SetColFillColor(0,'lightgray'); + +$table->SetCellFillColor(0,0,'lightgreen'); +$table->SetCellFillColor(1,0,'lightgreen'); +$table->SetCellFillColor(2,0,'lightgreen'); + +// Highlight cell 2,3 +$table->SetCellFillColor(4,3,'yellow'); + +$graph->Add($table); +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex04.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex04.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex04.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex04.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +Init(); +$table->Set($data); +$table->SetBorder(2,'black'); + +// Highlight summation row +$table->SetRowFillColor($r-1,'yellow'); +$table->SetCellAlign($r-1,0,'right'); + +// Setup row and column headers +$table->SetRowFont(0,FF_ARIAL,FS_NORMAL,10); +$table->SetRowColor(0,'navy'); +$table->SetRowFillColor(0,'lightgray'); + +$table->SetColFont(0,FF_ARIAL,FS_NORMAL,10); +$table->SetColColor(0,'navy'); +$table->SetColFillColor(0,'lightgray'); + +$table->SetRowGrid($r-1,1,'black',TGRID_DOUBLE); + +$graph->Add($table); +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex05.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex05.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tableex05.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tableex05.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,53 @@ +Init(); +$table->Set($data); +$table->SetBorder(2,'black'); + +// Highlight summation row +$table->SetRowFillColor($r-1,'yellow'); +$table->SetCellAlign($r-1,0,'right'); + +// Setup row and column headers +$table->SetRowFont(0,FF_ARIAL,FS_NORMAL,10); +$table->SetRowColor(0,'navy'); +$table->SetRowFillColor(0,'lightgray'); + +$table->SetColFont(0,FF_ARIAL,FS_NORMAL,10); +$table->SetColColor(0,'navy'); +$table->SetColFillColor(0,'lightgray'); + +$table->SetRowGrid($r-1,1,'black',TGRID_DOUBLE); + +$table->SetFont(1,4,2,6,FF_TIMES,FS_NORMAL,18); +$table->SetFillColor(1,1,2,3,'red'); + +$table->MergeCol(1); +$graph->Add($table); +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_flagex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_flagex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_flagex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_flagex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,70 @@ +Set($data); +$table->SetFont(FF_TIMES,FS_NORMAL,11); + +// Adjust the font for row 0 and 6 +$table->SetColFont(0,FF_ARIAL,FS_BOLD,11); +$table->SetRowFont(6,FF_TIMES,FS_BOLD,12); + +// Set the minimum heigth/width +$table->SetMinRowHeight(2,10); +$table->SetMinColWidth(70); + +// Add some padding (in pixels) +$table->SetRowPadding(2,0); +$table->SetRowGrid(6,1,'darkgray',TGRID_DOUBLE2); + +// Setup the grid +$table->SetGrid(0); +$table->SetRowGrid(6,1,'black',TGRID_DOUBLE2); + +// Merge all cells in row 0 +$table->MergeRow(0); + +// Set aligns +$table->SetAlign(3,0,6,6,'right'); +$table->SetRowAlign(1,'center'); +$table->SetRowAlign(2,'center'); + +// Set background colors +$table->SetRowFillColor(0,'lightgray@0.5'); +$table->SetColFillColor(0,'lightgray@0.5'); + +// Add the country flags in row 1 +$n = count($countries); +for($i=0; $i < $n; ++$i ) { + $table->SetCellCountryFlag(1,$i+1,$countries[$i],0.5); + $table->SetCellImageConstrain(1,$i+1,TIMG_HEIGHT,20); +} + +// Add the table to the graph +$graph->Add($table); + +// Send back the table graph to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,21 @@ +Set($data); + +// Add the table to the graph +$graph->Add($table); + +// ... and send back the table to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,25 @@ +Set($data); + +// Merge all cellsn in the rectangle with +// top left corner = (0,2) and bottom right = (1,3) +$table->MergeCells(0,2,1,3); + +// Add the table to the graph +$graph->Add($table); + +// ... and send back the table to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,24 @@ +Set($data); + +// Merge all cells in row 0 +$table->MergeRow(0); + +// Add table to graph +$graph->Add($table); + +// ... and send back the table to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,28 @@ +Set($data); + +// Merge all cells in row 0 +$table->MergeRow(0); + +// Set foreground and background color +$table->SetCellFillColor(0,0,'orange@0.7'); +$table->SetCellColor(0,0,'darkred'); + +// Add the table to the graph +$graph->Add($table); + +// and send it back to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,30 @@ +Set($data); + +// Merge all cells in row 0 +$table->MergeRow(0); + +// Adjust font in cell (0,0) +$table->SetCellFont(0,0,FF_ARIAL,FS_BOLD,14); + +// Set left align for all cells in rectangle (0,0) - (0,3) +$table->SetAlign(0,0,0,3,'Left'); + +// Add table to graph +$graph->Add($table); + +// ... send it back to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,32 @@ +Set($data); + +// Merge all cells in row 0 +$table->MergeRow(0); + +// Setup font and color +$table->SetCellFont(0,0,FF_ARIAL,FS_BOLD,14); +$table->SetRowFillColor(0,'orange@0.5'); +$table->SetRowColor(0,'darkred'); + +// Setup the minimum width of all columns +$table->SetMinColWidth(35); + +// Add table to the graph +$graph->Add($table); + +// ... send it back to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +Set($data); + +// Set default font in entire table +$table->SetFont(FF_ARIAL,FS_NORMAL,11); + +// Setup font and color for row = 2 +$table->SetRowFont(2,FF_ARIAL,FS_BOLD,11); +$table->SetRowFillColor(2,'orange@0.5'); + +// Setup minimum color width +$table->SetMinColWidth(35); + +// Setup grid on row 2 +$table->SetRowGrid(2,1,'black',TGRID_DOUBLE); + +// Add table to the graph +$graph->Add($table); + +// and send it back to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +Set($data); + +// Set default font in entire table +$table->SetFont(FF_ARIAL,FS_NORMAL,11); + +// Setup font and color for row = 2 +$table->SetRowFont(2,FF_ARIAL,FS_BOLD,11); +$table->SetRowFillColor(2,'orange@0.5'); + +// Setup minimum color width +$table->SetMinColWidth(35); + +// Setup grid on row 2 +$table->SetRowGrid(2,1,'black',TGRID_DOUBLE2); + +// Add table to the graph +$graph->Add($table); + +// and send it back to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,34 @@ +Set($data); + +// Set default font in entire table +$table->SetFont(FF_ARIAL,FS_NORMAL,11); + +// Setup font and color for row = 2 +$table->SetRowFont(2,FF_ARIAL,FS_BOLD,11); +$table->SetRowFillColor(2,'orange@0.5'); + +// Setup minimum color width +$table->SetMinColWidth(35); + +// Setup grid on row 2 +$table->SetRowGrid(2,1,'black',TGRID_DOUBLE2); + +// Add table to the graph +$graph->Add($table); + +// and send it back to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto8.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto8.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto8.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto8.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,43 @@ +Set($data); + +// Setup overall table font +$table->SetFont(FF_ARIAL,FS_NORMAL,11); + +// Setup font and color for row = 2 +$table->SetRowFont(2,FF_ARIAL,FS_BOLD,11); +$table->SetRowFillColor(2,'orange@0.5'); + +// Setup minimum color width +$table->SetMinColWidth(35); + +// Setup overall cell alignment for the table +$table->SetAlign('right'); + +// Setup overall table border +$table->SetBorder(0,'black'); + +// Setup overall table grid +$table->setGrid(0,'black'); + +// Set specific frid for row = 2 +$table->SetRowGrid(2,1,'black',TGRID_DOUBLE2); + +// Add the table to the graph +$graph->Add($table); + +// and send it back to the browser +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto9.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto9.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto9.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_howto9.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ +Set($data); + +// Setup overall table font +$table->SetFont(FF_ARIAL,FS_NORMAL,11); + +// Setup font and color for row = 2 +$table->SetRowFont(2,FF_ARIAL,FS_BOLD,11); +$table->SetRowFillColor(2,'orange@0.5'); + +// Setup minimum color width +$table->SetMinColWidth(40); + +// Setup overall cell alignment for the table +$table->SetAlign('right'); + +// Setup overall table border +$table->SetBorder(0,'black'); + +// Setup overall table grid +$table->setGrid(0,'black'); + +// Set specific frid for row = 2 +$table->SetRowGrid(2,1,'black',TGRID_DOUBLE2); + +// Setup overall number format in all cells +$table->SetNumberFormat("%0.1f"); + +// Add table to the graph +$graph->Add($table); + +// and send it back to the browser +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex00.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex00.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex00.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex00.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ +Set($data); +$table->SetFont(FF_TIMES,FS_NORMAL,11); + +// Set default table alignment +$table->SetAlign('right'); + +// Add table to graph +$graph->Add($table); + +// and send it back to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +Set($data); + +// Setup fonts +$table->SetFont(FF_TIMES,FS_NORMAL,11); +$table->SetColFont(0,FF_ARIAL,FS_NORMAL,11); +$table->SetRowFont(0,FF_ARIAL,FS_NORMAL,11); +$table->SetRowFont(4,FF_TIMES,FS_BOLD,14); + +// Turn off the grid +$table->SetGrid(0); + +// Setup color +$table->SetRowFillColor(0,'lightgray@0.5'); +$table->SetRowFillColor(4,'lightgray@0.5'); +$table->SetColFillColor(0,'lightgray@0.5'); +$table->SetFillColor(0,0,4,0,'lightgray@0.5'); + +// Set default minimum column width +$table->SetMinColWidth(45); + +// Set default table alignment +$table->SetAlign('right'); + +// Add table to the graph +$graph->Add($table); + +// and send it back to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,56 @@ +Set($data); +$table->SetFont(FF_ARIAL,FS_NORMAL,11); + +// Setup default column width +$table->SetMinColWidth(40); + +// Setup defalt table alignment +$table->SetAlign('right'); + +// Turn off border +$table->SetBorder(0); + +// Turn off grid +$table->setGrid(0); + +// Setup font for row 4 and 0 +$table->SetRowFont(4,FF_ARIAL,FS_BOLD,11); +$table->SetRowFont(0,FF_ARIAL,FS_BOLD,11); + +// Setup color +$table->SetRowFillColor(4,'orange@0.5'); +$table->SetFillColor(0,1,0,6,'teal@0.8'); + + +// Setup grids +$table->SetRowGrid(4,1,'black',TGRID_DOUBLE2); +$table->SetColGrid(1,1,'black',TGRID_SINGLE); +$table->SetRowGrid(1,1,'black',TGRID_SINGLE); + +// Add table to the graph +$graph->Add($table); + +// Send it back to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ +Set($data); +$table->SetFont(FF_ARIAL,FS_NORMAL,11); + +// Set default minimum color width +$table->SetMinColWidth(40); + +// Set default table alignment +$table->SetAlign('right'); + +// Set table border +$table->SetBorder(0); + +// Turn off grid +$table->setGrid(0); + +// Setup font +$table->SetRowFont(4,FF_ARIAL,FS_BOLD,11); +$table->SetRowFont(0,FF_ARIAL,FS_BOLD,11); + +// Setup various grid lines +$table->SetRowGrid(4,2,'black',TGRID_SINGLE); +$table->SetColGrid(1,3,'black',TGRID_SINGLE); +$table->SetRowGrid(1,1,'black',TGRID_SINGLE); + +// Setup various colors +$table->SetFillColor(0,1,0,6,'black'); +$table->SetRowColor(0,'white'); +$table->SetRowFillColor(4,'lightyellow'); +$table->SetFillColor(2,0,2,6,'lightgray'); + +// Add table to the graph +$graph->Add($table); + + +// Send back to client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_mex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,59 @@ +Set($data); +$table->SetFont(FF_ARIAL,FS_NORMAL,11); + +// Set default minimum color width +$table->SetMinColWidth(40); + +// Set default table alignment +$table->SetAlign('right'); + +// Turn off grid +$table->setGrid(0); + +// Set table border +$table->SetBorder(2); + +// Setup font +$table->SetRowFont(4,FF_ARIAL,FS_BOLD,11); +$table->SetRowFont(0,FF_ARIAL,FS_BOLD,11); +$table->SetFont(1,2,1,3,FF_ARIAL,FS_BOLD,11); + +// Setup grids +$table->SetRowGrid(4,2,'black',TGRID_SINGLE); +$table->SetColGrid(1,1,'black',TGRID_SINGLE); +$table->SetRowGrid(1,1,'black',TGRID_SINGLE); + +// Setup colors +$table->SetFillColor(0,1,0,6,'black'); +$table->SetRowColor(0,'white'); +$table->SetRowFillColor(4,'lightgray@0.3'); +$table->SetFillColor(2,0,2,6,'lightgray@0.6'); +$table->SetFillColor(1,2,1,3,'lightred'); + +// Add table to graph +$graph->Add($table); + +// Send back to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_vtext_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_vtext_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_vtext_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_vtext_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +Set($data); +$table->SetFont(FF_TIMES,FS_NORMAL,11); + +// Default table alignment +$table->SetAlign('right'); + +// Adjust font in (0,0) +$table->SetCellFont(0,0,FF_TIMES,FS_BOLD,14); + +// Rotate all textxs in row 0 +$table->SetRowTextOrientation(0,90); + +// Adjust alignment in cell (0,0) +$table->SetCellAlign(0,0,'center','center'); + +// Add table to graph +$graph->Add($table); + +// Send back table to client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_vtext.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_vtext.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/table_vtext.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/table_vtext.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,42 @@ +Set($data); +$table->SetAlign('right'); +$table->SetFont(FF_TIMES,FS_NORMAL,12); +$table->SetCellFont(0,0,FF_ARIAL,FS_BOLD,16); + +// Rotate the entire table 90 degrees +$table->SetTextOrientation(90); +//$table->SetCellTextOrientation(0,0,0); + +// Setup background color for header column +$table->SetColFillColor(0,'lightgray'); + +// Set the imnimum row height +$table->SetMinRowHeight(0,150); + +// Add table to graph +$graph->Add($table); + +// and send it back to the client +$graph->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tabtitleex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tabtitleex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tabtitleex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tabtitleex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ +clearTheme(); +$graph->SetMarginColor('white'); +$graph->SetScale("textlin"); +$graph->SetFrame(false); +$graph->SetMargin(30,50,30,30); + +$graph->tabtitle->Set(' Year 2003 ' ); +$graph->tabtitle->SetFont(FF_ARIAL,FS_BOLD,13); + + +$graph->yaxis->HideZeroLabel(); +$graph->ygrid->SetFill(true,'#EFEFEF@0.5','#BBCCFF@0.5'); +$graph->xgrid->Show(); + +$graph->xaxis->SetTickLabels($gDateLocale->GetShortMonth()); + +// Create the first line +$p1 = new LinePlot($datay1); +$p1->SetColor("navy"); +$p1->SetLegend('Line 1'); +$graph->Add($p1); + +// Create the second line +$p2 = new LinePlot($datay2); +$p2->SetColor("red"); +$p2->SetLegend('Line 2'); +$graph->Add($p2); + +// Create the third line +$p3 = new LinePlot($datay3); +$p3->SetColor("orange"); +$p3->SetLegend('Line 3'); +$graph->Add($p3); + +$graph->legend->SetShadow('gray@0.4',5); +$graph->legend->SetPos(0.1,0.1,'right','top'); +// Output line +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/temp_hum_pluie.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/temp_hum_pluie.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/temp_hum_pluie.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/temp_hum_pluie.php 2020-11-10 01:49:41.000000000 +0000 @@ -0,0 +1,180 @@ + $te_max ) { + $te_max = $te; + } + + if ( $te >= 40 ) { + $te_40[ $i ] = $te; + $te_30[ $i ] = 40; + $te_20[ $i ] = 30; + $te_10[ $i ] = 20; + $te_0[ $i ] = 10; + $te_neg[ $i ] = 0; + } elseif ( $te >= 30 ) { + $te_40[ $i ] = 0; + $te_30[ $i ] = $te; + $te_20[ $i ] = 30; + $te_10[ $i ] = 20; + $te_0[ $i ] = 10; + $te_neg[ $i ] = 0; + } + elseif ( $te >= 20 ) { + $te_40[ $i ] = 0; + $te_30[ $i ] = 0; + $te_20[ $i ] = $te; + $te_10[ $i ] = 20; + $te_0[ $i ] = 10; + $te_neg[ $i ] = 0; + } + elseif ( $te >= 10 ) { + $te_40[ $i ] = 0; + $te_30[ $i ] = 0; + $te_20[ $i ] = 0; + $te_10[ $i ] = $te; + $te_0[ $i ] = 10; + $te_neg[ $i ] = 0; + } + elseif ( $te > 0 ) { + $te_40[ $i ] = 0; + $te_30[ $i ] = 0; + $te_20[ $i ] = 0; + $te_10[ $i ] = 0; + $te_0[ $i ] = $te; + $te_neg[ $i ] = 0; + } + else { + $te_40[ $i ] = 0; + $te_30[ $i ] = 0; + $te_20[ $i ] = 0; + $te_10[ $i ] = 0; + $te_0[ $i ] = 0; + $te_neg[ $i ] = $te; + } + + // Stockage HUMIDITE + $he[ $i ] = str_replace( ",", ".", $data[ 3 ] ); + + // stockage PLUIE + $pl[ $i ] = str_replace( ",", ".", $data[ 4 ] ); + + +} // fin de la lecture du fichier + + if ( $te_min > 0 ) { + $te_min = 0; + } + +$te_min = floor( $te_min - .4 ); +$te_max = ceil( $te_max + .4 ); + +//--------------------------------------------------------------------------- +// Create the graph +$graph = new Graph( 860, 400 ); + +$graph->SetScale( "lin",$te_min,$te_max ); +$graph->img->SetMargin( 60, 60, 10, 130 ); + +$graph->graph_theme = null; + +$yt40 = new LinePlot( $te_40 ); +$yt40->SetFillColor( '#000' ); //noir +$yt40->SetColor( '#000' ); +$graph->Add( $yt40 ); + +$yt30 = new LinePlot( $te_30 ); +$yt30->SetFillColor( '#f00' ); // rouge +$yt30->SetColor( '#f00' ); +$graph->Add( $yt30 ); + +$yt20 = new LinePlot( $te_20 ); +$yt20->SetFillColor( '#ffa500' ); // orange +$yt20->SetColor( '#ffa500' ); +$graph->Add( $yt20 ); + +$yt10 = new LinePlot( $te_10 ); +$yt10->SetFillColor( '#ffd700' ); // gold +$yt10->SetColor( '#ffd700' ); +$graph->Add( $yt10 ); + +$yt00 = new LinePlot( $te_0 ); +$yt00->SetFillColor( '#1e90ff' ); //dodgerblue +$yt00->SetColor( '#1e90ff' ); +$graph->Add( $yt00 ); + +$yneg = new LinePlot( $te_neg ); +$yneg->SetFillColor( '#feffff' ); // presque blanc pour éviter la transparence +$yneg->SetColor( '#feffff' ); +$graph->Add( $yneg ); + +//Humidité +$graph->SetY2Scale("lin",0,100); +$yh = new LinePlot($he); +$yh->SetColor('darkblue'); +$yh->SetWeight(3); +$graph->AddY2($yh); +$graph->SetY2OrderBack(false); + +// axe des X +$graph->xaxis->SetTickLabels($dt); +$graph->xaxis->HideLastTickLabel(); + +//Set the angle for the labels to 90 degrees +$graph->xaxis->SetLabelAngle( 90 ); +$graph->xaxis->SetPos( $te_min ); + +// The automatic format string for dates can be overridden +//$graph->xaxis->scale->SetDateFormat( 'd/m/Y H:i' ); + + +//transparence +$graph->SetMarginColor( 'white' ); +$graph->SetFrame( false ); +$graph->ygrid->SetFill( false ); + +$graph->img->SetTransparent( 'white' ); + +//font +$graph->title->SetFont( FF_FONT1, FS_BOLD ); +$graph->yaxis->SetFont( FF_FONT1, FS_BOLD ); +$graph->yaxis->SetFont( FF_FONT1, FS_BOLD ); +$graph->xaxis->SetFont( FF_FONT1, FS_BOLD ); + + +// Display the graph +$graph->Stroke(); +?> \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/test2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/test2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/test2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/test2.php 2020-08-19 05:43:36.000000000 +0100 @@ -0,0 +1,98 @@ +SetColor("black"); + $graph->SetMargin(0,0,0,0); + $graph->SetFrame(false); + + $odo = new Odometer(ODO_HALF); + $odo->scale->Set(0,0.6); + $odo->scale->SetTicks(0.1); + $odo->scale->SetLabelFormat('%.01f'); + $odo->AddIndication(0,.1,"green:0.9"); + $odo->AddIndication(.1,.2,"green:0.7"); + $odo->AddIndication(.2,.4,"yellow"); + $odo->AddIndication(.4,.6,"red"); + $odo->SetCenterAreaWidth(0.4); //Area around needle + $odo->SetColor("black"); + $odo->SetBorder("black",1); + $odo->SetPos(0.5,0.1); //Center meter in image + +// Set display value for the odometer + $odo->needle->Set(1.5); + + $odo->needle->SetFillColor("white"); + $odo->SetBase(true,0.,"black","black","yellow"); + $graph->Add($odo); + +// $graph->Stroke(); + + $gdImgHandler = $graph->Stroke(_IMG_HANDLER); + $contentType = 'image/png'; + ob_start(); + imagepng($gdImgHandler); + $image_data = ob_get_contents(); + ob_end_clean(); + echo ''; +} + +function draw_graph($ydata, $machine_name, $linecolor, $avgcycles) +{ + + $graph = new Graph(600,120); + $graph->clearTheme(); + + $graph->SetColor('black'); + $graph->SetScale('textlin'); + $graph->SetMargin(55,20,30,30); + $graph->SetMarginColor('black'); + +//$graph->xaxis->SetFont(FF_ARIAL,FS_NORMAL,9); + $graph->xaxis->SetColor('black','white'); + $graph->xaxis->title->SetColor('white'); + $graph->xaxis->SetTitle('Last 50 Cycles','center'); + $graph->xaxis->SetTitleMargin(10); + $graph->xaxis->setTextTickInterval(2); + +// $graph->yaxis->SetFont(FF_ARIAL,FS_NORMAL,9); + $graph->yaxis->SetColor('black','white'); + $graph->yaxis->SetTitleMargin(45); + $graph->yaxis->SetColor('black','white'); + $graph->yaxis->title->SetColor('white'); + $graph->yaxis->SetTitle('Seconds','center'); + +// $graph->title->SetFont(FF_FONT1,FS_NORMAL,10); + $graph->title->SetColor('white'); + $graph->title->Set($machine_name); +// $graph->subtitle->SetFont(FF_FONT1,FS_NORMAL,8); + $graph->subtitle->Set("AVG Cycles: ".$avgcycles); + $graph->subtitle->SetColor('white'); + +// $graph->img->SetImgFormat('png'); +// $graph->img->SetQuality(100); + + $lineplot=new LinePlot($ydata); + $graph->Add($lineplot); + $lineplot->SetColor($linecolor); + $lineplot->SetWeight(2); +// $lineplot->SetFillGradient('white','darkgreen'); + +// $graph->Stroke(); + + $gdImgHandler = $graph->Stroke(_IMG_HANDLER); + $contentType = 'image/png'; + ob_start(); + imagepng($gdImgHandler); + $image_data = ob_get_contents(); + ob_end_clean(); + echo ''; +} + +draw_gauge(); +//draw_graph([1,2,3,4,5], 'test', '#000', 'avg'); \ No newline at end of file diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/test.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/test.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/test.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/test.php 2020-11-11 01:53:18.000000000 +0000 @@ -0,0 +1,31 @@ +SetMargin(60,20,20,50); +$graph->SetScale('textlin'); + +$ydata = array(0=> 95.5, 1 => 94.32); + +$line = new LinePlot($ydata); +$graph->Add($line); + +$graph->yaxis->HideLine(false); +$graph->yaxis->HideTicks(false,false); +$graph->xaxis->HideTicks(false,false); +$graph->xaxis->SetTextTickInterval(5,4); +$line->SetLegend('Yield % By Distillation'); + +$graph->yaxis->title->Set('Yield %'); +$graph->yaxis->SetTitleMargin(40); +$graph->xgrid->Show(); +$graph->xgrid->SetLineStyle("solid"); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/testsuit.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/testsuit.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/testsuit.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/testsuit.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,107 @@ +iType = $aType; + if( $aDir == '' ) { + $aDir = getcwd(); + } + if( !chdir($aDir) ) { + die("PANIC: Can't access directory : $aDir"); + } + $this->iDir = $aDir; + } + + function GetFiles() { + $d = @dir($this->iDir); + $a = array(); + while( $entry=$d->Read() ) { + if( strstr($entry,".php") && strstr($entry,"x") && !strstr($entry,"show") && !strstr($entry,"csim") ) { + $a[] = $entry; + } + } + $d->Close(); + if( count($a) == 0 ) { + die("PANIC: Apache/PHP does not have enough permission to read the scripts in directory: $this->iDir"); + } + sort($a); + return $a; + } + + function GetCSIMFiles() { + $d = @dir($this->iDir); + $a = array(); + while( $entry=$d->Read() ) { + if( strstr($entry,".php") && strstr($entry,"csim") ) { + $a[] = $entry; + } + } + $d->Close(); + if( count($a) == 0 ) { + die("PANIC: Apache/PHP does not have enough permission to read the CSIM scripts in directory: $this->iDir"); + } + sort($a); + return $a; + } + + + function Run() { + switch( $this->iType ) { + case 1: + $files = $this->GetFiles(); + break; + case 2: + $files = $this->GetCSIMFiles(); + break; + default: + die('Panic: Unknown type of test'); + break; + } + $n = count($files); + echo "

Visual test suit for JpGraph

"; + echo "Testtype: " . ($this->iType==1 ? ' Standard images ':' Image map tests '); + echo "
Number of tests: $n

"; + echo "

    "; + + for( $i=0; $i<$n; ++$i ) { + if( $this->iType ==1 ) { + echo '

  1. Filename: '.basename($files[$i])."\n"; + } + else { + echo '
  2. '.$files[$i]."\n"; + } + } + echo "
"; + + echo "

Done.

"; + } +} + +$type=@$_GET['type']; +if( empty($type) ) { + $type=1; +} + +$driver = new TestDriver($type); +$driver->Run(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/textalignex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/textalignex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/textalignex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/textalignex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,91 @@ +img; + +// Get the bounding box for text +$img->SetFont(FF_ARIAL,FS_NORMAL,16); +$tw=$img->GetBBoxWidth($txt,$angle); +$th=$img->GetBBoxHeight($txt,$angle); + +$img->SetFont(FF_ARIAL,FS_NORMAL,11); +$ch=$img->GetBBoxHeight($caption); + +// Calculate needed height for the image +$h = 3*$th+2*$ym + $ch; +$g = new CanvasGraph($w,$h); +$img = $g->img; + +// Alignment for anchor points to use +$anchors = array('left','top', + 'center','top', + 'right','top', + 'left','center', + 'center','center', + 'right','center', + 'left','bottom', + 'center','bottom', + 'right','bottom'); + +$n = count($anchors)/2; + +for( $i=0,$r=0,$c=0; $i < $n; ++$i ) { + + $x = $c*($tw+$xm)+$xm/2; + $y = $r*($th+$ym)+$ym/2-10; + + $img->SetColor('blue'); + $img->SetTextAlign($anchors[$i*2],$anchors[$i*2+1]); + $img->SetFont(FF_ARIAL,FS_NORMAL,16); + $img->StrokeText($x,$y,$txt,$angle,"left",true); + + $img->SetColor('black'); + $img->SetFont(FF_FONT1,FS_BOLD); + $img->SetTextAlign('center','top'); + $align = sprintf('("%s","%s")',$anchors[$i*2],$anchors[$i*2+1]); + $img->StrokeText($c*($tw/2+$xm)+$xm/2+$tw/2,$r*($th/2+$ym)+$th+$ym/2-4,$align); + + $c++; + if( $c==3 ) { + $c=0;$r++; + } +} + +// Draw the caption text +$img->SetTextAlign('center','bottom'); +$img->SetFont(FF_ARIAL,FS_ITALIC,11); +$img->StrokeText($w/2,$h-10,$caption,0,'left'); + +$img->SetColor('navy'); +$img->Rectangle(0,0,$w-1,$h-1); + +// .. and send back to browser +$g->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/text-example1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/text-example1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/text-example1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/text-example1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,18 @@ +SetPos(0.05,0.5); +$t1->SetOrientation("h"); +$t1->SetFont(FF_FONT1,FS_NORMAL); +$t1->SetBox("white","black",'gray'); +$t1->SetColor("black"); +$graph->AddText($t1); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/text-example2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/text-example2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/text-example2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/text-example2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,18 @@ +SetPos(0.05,100); +$t1->SetFont(FF_FONT1,FS_NORMAL); +$t1->SetBox("white","black",true); +$t1->ParagraphAlign("right"); +$t1->SetColor("black"); +$graph->AddText($t1); + +$graph->Stroke(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/textpalignex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/textpalignex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/textpalignex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/textpalignex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,44 @@ +img; + +// Alignment for anchor points to use +$palign = array('left','center','right'); + +$n = count($palign); +$t = new Text($txt); + +$y = $ym; +for( $i=0; $i < $n; ++$i ) { + + $x = $xm + $i*$tw; + + $t->SetColor('black'); + $t->SetAlign('left','top'); + $t->SetFont(FF_ARIAL,FS_NORMAL,11); + $t->SetBox(); + $t->SetParagraphAlign($palign[$i]); + $t->Stroke($img, $x,$y); + + $img->SetColor('black'); + $img->SetFont(FF_FONT1,FS_BOLD); + $img->SetTextAlign('center','top'); + $img->StrokeText($x+140,$y+160,'"'.$palign[$i].'"'.' pargraph align'); + +} + +// .. and send back to browser +$g->Stroke(); + +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/theme_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/theme_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/theme_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/theme_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,23 @@ +SetScale('textlin'); + +$theme_class = new AquaTheme; +$graph->SetTheme($theme_class); + +// after setting theme, you can change details as you want +$graph->SetFrame(true, 'lightgray'); // set frame visible + +$graph->xaxis->SetTickLabels(array('A','B','C','D')); // change xaxis lagels +$graph->title->Set("Theme Example"); // add title + +// add barplot +$bplot = new BarPlot($data1y); +$graph->Add($bplot); +$graph->SetColor('#cc1111'); // you can change color only after calling Add() + +$graph->Stroke(); Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tiger1.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tiger1.jpg differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tiger_bkg.gif and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tiger_bkg.gif differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tiger_bkg.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tiger_bkg.jpg differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tiger_bkg.png and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tiger_bkg.png differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/timestampex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/timestampex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/timestampex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/timestampex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,59 @@ +SetMargin(40,20,30,50); + +// Now specify the X-scale explicit but let the Y-scale be auto-scaled +$graph->SetScale("intlin",0,0,$adjstart,$adjend); +$graph->title->Set("Example on TimeStamp Callback"); + +// Setup the callback and adjust the angle of the labels +$graph->xaxis->SetLabelFormatCallback('TimeCallback'); +$graph->xaxis->SetLabelAngle(90); + +// Set the labels every 5min (i.e. 300seconds) and minor ticks every minute +$graph->xaxis->scale->ticks->Set(300,60); + +$line = new LinePlot($data,$xdata); +$line->SetColor('lightblue'); +$graph->Add($line); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/titlecsimex01.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/titlecsimex01.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/titlecsimex01.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/titlecsimex01.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,62 @@ +SetScale("textlin"); +$graph->SetMargin(50,80,20,40); +$graph->yaxis->SetTitleMargin(30); +$graph->yaxis->scale->SetGrace(30); +$graph->SetShadow(); + + +// Create a bar pot +$bplot = new BarPlot($datay); + +// Create targets for the bars image maps. One for each column +$targ=array("bar_clsmex1.php#1","bar_clsmex1.php#2","bar_clsmex1.php#3","bar_clsmex1.php#4","bar_clsmex1.php#5","bar_clsmex1.php#6"); +$alts=array("val=%d","val=%d","val=%d","val=%d","val=%d","val=%d"); +$bplot->SetCSIMTargets($targ,$alts); +$bplot->SetFillColor("orange"); +$bplot->SetLegend('Year 2001 %%','#kalle ','%s'); + +// Display the values on top of each bar +$bplot->SetShadow(); +$bplot->value->SetFormat(" $ %2.1f",70); +$bplot->value->SetFont(FF_ARIAL,FS_NORMAL,9); +$bplot->value->SetColor("blue"); +$bplot->value->Show(); + +$graph->Add($bplot); + +// Create a big "button" that has an image map action +$txt1 = new Text("A simple text with\ntwo rows"); +$txt1->SetFont(FF_ARIAL); +$txt1->SetBox('lightblue','black','white@1',5); +$txt1->SetParagraphAlign('center'); +$txt1->SetPos(40,50); +$txt1->SetCSIMTarget('#88','Text element'); +$graph->Add($txt1); + +// Add image map to the graph title as well (you can do this to the +// sub- and subsub-title as well) +$graph->title->Set("Image maps barex1"); +$graph->title->SetFont(FF_FONT1,FS_BOLD); +$graph->title->SetCSIMTarget('#45','Title for Bar'); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +// Setup the axis title image map and font style +$graph->yaxis->title->SetFont(FF_FONT2,FS_BOLD); +$graph->yaxis->title->SetCSIMTarget('#55','Y-axis title'); +$graph->xaxis->title->SetFont(FF_FONT2,FS_BOLD); +$graph->xaxis->title->SetCSIMTarget('#55','X-axis title'); + +// Send back the HTML page which will call this script again +// to retrieve the image. +$graph->StrokeCSIM(); + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/titleex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/titleex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/titleex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/titleex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,29 @@ +SetScale("textlin"); +$graph->SetMargin(25,10,30,30); + +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); +$graph->title->Set('The Title'); +$graph->subtitle->SetFont(FF_ARIAL,FS_BOLD,10); +$graph->subtitle->Set('The Subtitle'); +$graph->subsubtitle->SetFont(FF_ARIAL,FS_ITALIC,9); +$graph->subsubtitle->Set('The Subsubitle'); + +// Create the linear plot +$lineplot=new LinePlot($ydata); +$lineplot->SetColor("blue"); + +// Add the plot to the graph +$graph->Add($lineplot); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/topxaxisex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/topxaxisex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/topxaxisex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/topxaxisex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ +clearTheme(); +$graph->img->SetMargin(40,40,40,20); + +$graph->SetScale("linlin"); +$graph->SetShadow(); +$graph->title->Set("Top X-axis"); + +// Start at 0 +$graph->yscale->SetAutoMin(0); + +// Add some air around the Y-scale +$graph->yscale->SetGrace(100); + +// Use built in font +$graph->title->SetFont(FF_FONT1,FS_BOLD); + +// Adjust the X-axis +$graph->xaxis->SetPos("max"); +$graph->xaxis->SetLabelSide(SIDE_UP); +$graph->xaxis->SetTickSide(SIDE_DOWN); + +// Create the line plot +$p1 = new LinePlot($datay); +$p1->SetColor("blue"); + +// Specify marks for the line plots +$p1->mark->SetType(MARK_FILLEDCIRCLE); +$p1->mark->SetFillColor("red"); +$p1->mark->SetWidth(4); + +// Show values +$p1->value->Show(); + +// Add lineplot to graph +$graph->Add($p1); + +// Output line +$graph->Stroke(); + +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tornado.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tornado.jpg differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tr1.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tr1.jpg differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tr2.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tr2.jpg differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tr3.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tr3.jpg differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tr4.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tr4.jpg differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tr5.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tr5.jpg differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/tr6.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/tr6.jpg differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/universal_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/universal_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/universal_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/universal_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ + array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ), + 1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ), + 2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ), + 3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ), + 4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ), + 5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ), + 6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ), + 7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ), + 8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ), +); + + +// Create the graph. These two calls are always required +$graph = new Graph(400,300); + +$graph->SetScale("textlin"); +if ($theme) { + $graph->SetTheme(new $theme()); +} +$theme_class = new UniversalTheme; +$graph->SetTheme($theme_class); + +$plot = array(); +// Create the bar plots +for ($i = 0; $i < 4; $i++) { + $plot[$i] = new BarPlot($data[$i]); + $plot[$i]->SetLegend('plot'.($i+1)); +} +//$acc1 = new AccBarPlot(array($plot[0], $plot[1])); +//$acc1->value->Show(); +$gbplot = new GroupBarPlot(array($plot[2], $plot[1] )); + +for ($i = 4; $i < 8; $i++) { + $plot[$i] = new LinePlot($data[$i]); + $plot[$i]->SetLegend('plot'.$i); + $plot[$i]->value->Show(); +} + +$graph->Add($gbplot); +$graph->Add($plot[4]); + +$title = "UniversalTheme Example"; +$title = mb_convert_encoding($title,'UTF-8'); +$graph->title->Set($title); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/vivid_example.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/vivid_example.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/vivid_example.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/vivid_example.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,57 @@ + array (0 => 79, 1 => -25, 2 => -7, 3 => 85, 4 => -26, 5 => -32, ), + 1 => array (0 => 76, 1 => 51, 2 => 86, 3 => 12, 4 => -7, 5 => 94, ), + 2 => array (0 => 49, 1 => 38, 2 => 7, 3 => -40, 4 => 9, 5 => -7, ), + 3 => array ( 0 => 69, 1 => 96, 2 => 49, 3 => 7, 4 => 92, 5 => -38, ), + 4 => array ( 0 => 68, 1 => 16, 2 => 82, 3 => -49, 4 => 50, 5 => 7, ), + 5 => array ( 0 => -37, 1 => 28, 2 => 32, 3 => 6, 4 => 13, 5 => 57, ), + 6 => array ( 0 => 24, 1 => -11, 2 => 7, 3 => 10, 4 => 51, 5 => 51, ), + 7 => array ( 0 => 3, 1 => -1, 2 => -12, 3 => 61, 4 => 10, 5 => 47, ), + 8 => array ( 0 => -47, 1 => -21, 2 => 43, 3 => 53, 4 => 36, 5 => 34, ), +); + +// Create the graph. These two calls are always required +$graph = new Graph(400,300); + +$graph->SetScale("textlin"); +if ($theme) { + $graph->SetTheme(new $theme()); +} +$theme_class = new VividTheme; +$graph->SetTheme($theme_class); + +$plot = array(); +// Create the bar plots +for ($i = 0; $i < 4; $i++) { + $plot[$i] = new BarPlot($data[$i]); + $plot[$i]->SetLegend('plot'.($i+1)); +} +//$acc1 = new AccBarPlot(array($plot[0], $plot[1])); +//$acc1->value->Show(); +$gbplot = new GroupBarPlot(array($plot[2], $plot[1] )); + +for ($i = 4; $i < 8; $i++) { + $plot[$i] = new LinePlot($data[$i]); + $plot[$i]->SetLegend('plot'.$i); + $plot[$i]->value->Show(); +} + +$graph->Add($gbplot); +$graph->Add($plot[4]); + +$title = "VividTheme Example"; +$title = mb_convert_encoding($title,'UTF-8'); +$graph->title->Set($title); +$graph->xaxis->title->Set("X-title"); +$graph->yaxis->title->Set("Y-title"); + +// Display the graph +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_2plots_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_2plots_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_2plots_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_2plots_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,44 @@ + array(10,10,13,7), + 2 => array(2,8,10), + 4 => array(1,12,22), + ); + +$data2 = array( + 4 => array(12,8,2,3), + 2 => array(5,4,4,5,2), + ); + +// Create a new small windrose graph +$graph = new WindroseGraph(660,400); +$graph->SetShadow(); + +$graph->title->Set('Two windrose plots in one graph'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); +$graph->subtitle->Set('(Using Box() for each plot)'); + +$wp = new WindrosePlot($data); +$wp->SetType(WINDROSE_TYPE8); +$wp->SetSize(0.42); +$wp->SetPos(0.25,0.55); +$wp->SetBox(); + +$wp2 = new WindrosePlot($data2); +$wp2->SetType(WINDROSE_TYPE16); +$wp2->SetSize(0.42); +$wp2->SetPos(0.74,0.55); +$wp2->SetBox(); +$wp2->SetRangeColors(array('green','yellow','red','brown')); + +$graph->Add($wp); +$graph->Add($wp2); + +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_bgimg_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_bgimg_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_bgimg_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_bgimg_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,50 @@ + array(12,8,2,3), + 6 => array(5,4,4,5,4), + ); + +$se_CompassLbl = array('O','ONO','NO','NNO','N','NNV','NV','VNV','V','VSV','SV','SSV','S','SSO','SO','OSO'); + +// Create a new small windrose graph +$graph = new WindroseGraph(400,400); +$graph->SetMargin(25,25,25,25); +$graph->SetFrame(); + +$graph->title->Set('Example with background flag'); +#$graph->title->SetFont(FF_VERA,FS_BOLD,14); + + +//$graph->SetBackgroundImage('bkgimg.jpg',BGIMG_FILLFRAME); +//$graph->SetBackgroundImageMix(90); +$graph->SetBackgroundCFlag(28,BGIMG_FILLFRAME,15); + + +$wp2 = new WindrosePlot($data2); +$wp2->SetType(WINDROSE_TYPE16); +$wp2->SetSize(0.55); +$wp2->SetPos(0.5,0.5); +$wp2->SetAntiAlias(false); + +$wp2->SetFont(FF_ARIAL,FS_BOLD,10); +$wp2->SetFontColor('black'); + +$wp2->SetCompassLabels($se_CompassLbl); +$wp2->legend->SetMargin(20,5); + +$wp2->scale->SetZFont(FF_ARIAL,FS_NORMAL,8); +$wp2->scale->SetFont(FF_ARIAL,FS_NORMAL,9); +$wp2->scale->SetLabelFillColor('white','white'); + +$wp2->SetRangeColors(array('green','yellow','red','brown')); + +$graph->Add($wp2); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,25 @@ + array(5,5,5,8), + 1 => array(3,4,1,4), + 'WSW' => array(1,5,5,3), + 'N' => array(2,3,8,1,1), + 15 => array(2,3,5)); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,400); +$graph->title->Set('A basic Windrose graph'); + +// Create the windrose plot. +$wp = new WindrosePlot($data); + +// Add and send back to browser +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex1b.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex1b.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex1b.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex1b.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ + array(1,1,2.5,4), + 1 => array(3,4,1,4), + 'wsw' => array(1,5,5,3), + 'N' => array(2,7,5,4,2), + 15 => array(2,7,12)); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,400); +$graph->title->Set('Windrose example 1b'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor('navy'); + +// Create the windrose plot. +// The default plot will have 16 compass axis. +$wp = new WindrosePlot($data); +$wp->SetRadialGridStyle('solid'); +$graph->Add($wp); + +// Setup the range so that the values do not touch eachother +$wp->SetRanges(array(0,1,2,3,4,5,6,7,8,10)); +$wp->SetRangeStyle(RANGE_DISCRETE); // Cmp with RANGE_OVERLAPPING as default + +// Send the graph to the browser +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,28 @@ + array(1,1,2.5,4), + 1 => array(3,4,1,4), + 'wsw' => array(1,5,5,3), + 'N' => array(2,7,5,4,2), + 15 => array(2,7,12)); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,400); + +// Setup title +$graph->title->Set('Windrose basic example'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor('navy'); + +// Create the windrose plot. +$wp = new WindrosePlot($data); +$wp->SetRadialGridStyle('solid'); +$graph->Add($wp); + +// Send the graph to the browser +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex2.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex2.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex2.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex2.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ + array(1,1,6,4), + 1 => array(3,8,1,4), + 2 => array(2,7,4,4,3), + 3 => array(2,7,1,2)); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,400); + +// Setup title +$graph->title->Set('Windrose example 2'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor('navy'); + +// Create the windrose plot. +$wp = new WindrosePlot($data); + +// Make it have 8 compass direction +$wp->SetType(WINDROSE_TYPE4); + +// Setup the weight of the laegs for the different ranges +$weights = array_fill(0,8,10); +$wp->SetRangeWeights($weights); + +// Adjust the font and font color for scale labels +$wp->scale->SetFont(FF_TIMES,FS_NORMAL,11); +$wp->scale->SetFontColor('navy'); + +// Set the diametr for the plot to 160 pixels +$wp->SetSize(160); + +// Set the size of the innermost center circle to 30% of the plot size +$wp->SetZCircleSize(0.2); + +// Adjust the font and font color for compass directions +$wp->SetFont(FF_ARIAL,FS_NORMAL,12); +$wp->SetFontColor('darkgreen'); + +// Add and send back to browser +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ + array(1,1,2.5,4), + 1 => array(3,4,1,4), + 3 => array(2,7,4,4,3), + 5 => array(2,7,1,2)); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,400); + +// Setup title +$graph->title->Set('Windrose example 2'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor('navy'); + +// Create the windrose plot. +$wp = new WindrosePlot($data); + +// Make it have 8 compass direction +$wp->SetType(WINDROSE_TYPE8); + +// Setup the weight of the laegs for the different ranges +$weights = array_fill(0,8,10); +$wp->SetRangeWeights($weights); + +// Adjust the font and font color for scale labels +$wp->scale->SetFont(FF_TIMES,FS_NORMAL,11); +$wp->scale->SetFontColor('navy'); + +// Set the diametr for the plot to 160 pixels +$wp->SetSize(200); + +// Set the size of the innermost center circle to 30% of the plot size +$wp->SetZCircleSize(0.2); + +// Adjust the font and font color for compass directions +$wp->SetFont(FF_ARIAL,FS_NORMAL,12); +$wp->SetFontColor('darkgreen'); + +// Add and send back the graph to the client +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex3.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex3.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex3.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex3.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,73 @@ + array(1,1,2.5,4), + 1 => array(3,4,1,4), + 3 => array(2,7,4,4,3), + 5 => array(2,7,1,2)); + +$data[1] = array( + "n" => array(1,1,2.5,4), + "ssw" => array(3,4,1,4), + "se" => array(2,7,4,4,3)); + +// Store the position and size data for each plot in an +// array to make it easier to create multiple plots. +// The format choosen for the layout data is +// (type,x-pos,y-pos,size, z-circle size) +$layout = array( + array(WINDROSE_TYPE8,0.25,0.55,0.4,0.25), + array(WINDROSE_TYPE16,0.75,0.55,0.4,0.25)); + +$legendtxt = array('(m/s) Station 7','(m/s) Station 12'); + +// First create a new windrose graph with a dropshadow +$graph = new WindroseGraph(600,350); +$graph->SetShadow('darkgray'); + +// Setup titles +$graph->title->Set('Windrose example 3'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor('navy'); +$graph->subtitle->Set('(Multiple plots in the same graph)'); +$graph->subtitle->SetFont(FF_VERDANA,FS_NORMAL,9); +$graph->subtitle->SetColor('navy'); + +// Create the two windrose plots. +for( $i=0; $i < count($data); ++$i ) { + $wp[$i] = new WindrosePlot($data[$i]); + + // Make it have 8 compass direction + $wp[$i]->SetType($layout[$i][0]); + + // Adjust the font and font color for scale labels + $wp[$i]->scale->SetFont(FF_TIMES,FS_NORMAL,10); + $wp[$i]->scale->SetFontColor('navy'); + + // Set the position of the plot + $wp[$i]->SetPos($layout[$i][1],$layout[$i][2]); + + // Set the diameter for the plot to 30% of the width of the graph pixels + $wp[$i]->SetSize($layout[$i][3]); + + // Set the size of the innermost center circle to 30% of the plot size + $wp[$i]->SetZCircleSize($layout[$i][4]); + + // Adjust the font and font color for compass directions + $wp[$i]->SetFont(FF_ARIAL,FS_NORMAL,10); + $wp[$i]->SetFontColor('darkgreen'); + + // Add legend text + $wp[$i]->legend->SetText($legendtxt[$i]); + + $graph->Add($wp[$i]); +} + +// Send the graph to the browser +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex4.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex4.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex4.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex4.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ + array(1,1,2.5,4), + 1 => array(3,4,1,4), + 3 => array(2,7,4,4,3), + 5 => array(2,7,1,2)); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,400); + +// Setup title +$graph->title->Set('Windrose example 4'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor('navy'); + +// Create the windrose plot. +$wp = new WindrosePlot($data); + +// Adjust the font and font color for scale labels +$wp->scale->SetFont(FF_TIMES,FS_NORMAL,11); +$wp->scale->SetFontColor('navy'); + +// Set the diameter and position for plot +$wp->SetSize(190); + +// Set the size of the innermost center circle to 40% of the plot size +// Note that we can have the automatic "Zero" sum appear in our custom text +$wp->SetZCircleSize(0.38); +$wp->scale->SetZeroLabel("Station 12\n(Calm %d%%)"); + +// Adjust color and font for center circle text +$wp->scale->SetZFont(FF_ARIAL,FS_NORMAL,9); +$wp->scale->SetZFontColor('darkgreen'); + +// Adjust the font and font color for compass directions +$wp->SetFont(FF_ARIAL,FS_NORMAL,10); +$wp->SetFontColor('darkgreen'); + +// Adjust the margin to the compass directions +$wp->SetLabelMargin(50); + +// Adjust grid colors +$wp->SetGridColor('silver','blue'); + +// Add (m/s) text to legend +$wp->legend->SetText('(m/s)'); +$wp->legend->SetMargin(20,5); + +// Add and send back to client +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex5.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex5.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex5.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex5.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,94 @@ + array(1,1,2.5,4), + 1 => array(3,4,1,4), + 3 => array(2,7,4,4,3), + 5 => array(2,7,1,2)); + +// Text to be added. +$txt=array(); +$txt[0] = "It is possible to add arbitrary,multi line, text to a graph. "; +$txt[0] .= "Such a paragraph can have it's text be left, right or center "; +$txt[0] .= "aligned."; +$txt[1] = "This is an example of a right aligned paragraph."; +$txt[2] = "Finally we can show a center aligned paragraph without box."; + +// We store the layout for each of the text boxes in an array +// to keep the code clean +$txtlayout = array( + array(0.97,0.15,25,'left','black','lightblue'), + array(0.97,0.4,20,'right','black','lightblue'), + array(0.97,0.7,20,'center','darkred',false,FF_COMIC,FS_NORMAL,12), +); + +// Range colors to be used +$rangeColors = array('silver','khaki','orange','brown','blue','navy','maroon','red'); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(570,430); +$graph->title->Set('Windrose example 5'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor('navy'); + +// Setup graph background color +$graph->SetColor('darkgreen@0.7'); + +// Setup all the defined text boxes +$n = count($txt); +for( $i=0; $i < $n; ++$i ) { + $txtbox[$i] = new Text($txt[$i]); + $txtbox[$i]->SetPos($txtlayout[$i][0],$txtlayout[$i][1],'right'); + $txtbox[$i]->SetWordwrap($txtlayout[$i][2]); + $txtbox[$i]->SetParagraphAlign($txtlayout[$i][3]); + $txtbox[$i]->SetColor($txtlayout[$i][4]); + $txtbox[$i]->SetBox($txtlayout[$i][5]); + if( count($txtlayout[$i]) > 6 ) + $txtbox[$i]->SetFont($txtlayout[$i][6],$txtlayout[$i][7],$txtlayout[$i][8]); +} +$graph->Add($txtbox); + +// Create the windrose plot. +$wp = new WindrosePlot($data); + +// Set background color for plot area +$wp->SetColor('lightyellow'); + +// Add a box around the plot +$wp->SetBox(); + +// Setup the colors for the ranges +$wp->SetRangeColors($rangeColors); + +// Adjust the font and font color for scale labels +$wp->scale->SetFont(FF_ARIAL,FS_NORMAL,9); +$wp->scale->SetFontColor('navy'); + +// Set the diameter and position for plot +$wp->SetSize(190); +$wp->SetPos(0.35,0.53); + +$wp->SetZCircleSize(0.2); + +// Adjust the font and font color for compass directions +$wp->SetFont(FF_ARIAL,FS_NORMAL,10); +$wp->SetFontColor('darkgreen'); + +// Adjust the margin to the compass directions +$wp->SetLabelMargin(50); + +// Adjust grid colors +$wp->SetGridColor('silver','blue'); + +// Add (m/s) text to legend +$wp->legend->SetText('(m/s)'); +$wp->legend->SetMargin(20,5); + +// Add plot and send back to client +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex6.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex6.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex6.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex6.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,89 @@ + array(1,1,2.5,4), + '32.0' => array(3,4,1,4), + '120.5' => array(2,3,4,4,3,2,1), + '223.2' => array(2,4,1,2,2), + '285.7' => array(2,2,1,2,4,2,1,1) +); + +// This file is encode din utf-8. The two Kanji characters roughly means +// 中 = Chinese +// 文 = Sentences +$ctxt = '中文'; + +// Specify text for direction labels +$labels = array( + '120.5' => $ctxt, + '232.2' => "Reference\n#13 Ver:2"); + +// Range colors to be used +$rangeColors = array('khaki','yellow','orange','orange:0.7','brown','darkred','black'); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,450); + +// Setup title +$graph->title->Set('Using chinese charecters'); +#$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor('navy'); +$graph->subtitle->Set('(Free type plot)'); +#$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10); +$graph->subtitle->SetColor('navy'); + +// Create the windrose plot. +$wp = new WindrosePlot($data); + +// Setup a free plot +$wp->SetType(WINDROSE_TYPEFREE); + +// Setup labels +$wp->SetLabels($labels); +$wp->SetLabelPosition(LBLPOSITION_CENTER); +$wp->SetLabelMargin(30); + +// Setup the colors for the ranges +$wp->SetRangeColors($rangeColors); + +// Adjust the font and font color for scale labels +#$wp->scale->SetFont(FF_ARIAL,FS_NORMAL,9); + +// Set the diameter and position for plot +#$wp->SetSize(240); +$wp->SetSize(200); +$wp->SetZCircleSize(30); +$wp->SetPos(0.5,0.5); + +// Adjust the font and font color for compass directions +#$wp->SetFont(FF_CHINESE,FS_NORMAL,12); +$wp->SetFontColor('darkgreen'); + +// Adjust grid colors +$wp->SetGridColor('darkgreen@0.7','blue'); + +// Add (m/s) text to legend +$wp->legend->SetText('(m/s)'); +$wp->legend->SetTFontColor('blue'); + +// Set legend label font color +$wp->legend->SetLFontColor('orange:0.7'); +#$wp->legend->SetLFont(FF_ARIAL,FS_ITALIC,8); + +// Display legend values with no decimals +$wp->legend->SetFormat('%d'); + +// Set the circle font to use chinse character set +// Note: When FF_CHINESE is used the input charectr data are +// assumed to already be in utf-8 encoding +#$wp->legend->SetCFont(FF_CHINESE,FS_NORMAL,14); +$wp->legend->SetCircleText($ctxt); +$wp->legend->SetCFontColor('red'); + +// Add plot to graph and send back to client +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex6.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex6.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex6.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex6.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,72 @@ + array(1,1,2.5,4), + '32.0' => array(3,4,1,4), + '120.5' => array(2,3,4,4,3,2,1), + '223.2' => array(2,4,1,2,2), + '285.7' => array(2,2,1,2,4,2,1,1) +); + +// Specify text for direction labels +$labels = array( '120.5' => "Plant\n#1275", + '285.7' => "Reference\n#13 Ver:2"); + +// Range colors to be used +$rangeColors = array('khaki','yellow','orange','orange:0.7','brown','darkred','black'); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,450); + +// Setup titles +$graph->title->Set('Windrose example 6'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor('navy'); + +$graph->subtitle->Set('(Free type plot)'); +$graph->subtitle->SetFont(FF_VERDANA,FS_ITALIC,10); +$graph->subtitle->SetColor('navy'); + +// Create the windrose plot. +$wp = new WindrosePlot($data); + +// Setup a free plot +$wp->SetType(WINDROSE_TYPEFREE); + +// Setup labels +$wp->SetLabels($labels); +$wp->SetLabelPosition(LBLPOSITION_CENTER); +$wp->SetLabelMargin(30); + +// Setup the colors for the ranges +$wp->SetRangeColors($rangeColors); + +// Adjust the font and font color for scale labels +$wp->scale->SetFont(FF_ARIAL,FS_NORMAL,9); + +// Set the diameter and position for plot +$wp->SetSize(230); +$wp->SetZCircleSize(30); + +// Adjust the font and font color for compass directions +$wp->SetFont(FF_ARIAL,FS_NORMAL,10); +$wp->SetFontColor('darkgreen'); + +// Adjust grid colors +$wp->SetGridColor('darkgreen@0.7','blue'); + +// Add (m/s) text to legend +$wp->legend->SetText('(m/s)'); + +// Display legend values with no decimals +$wp->legend->SetFormat('%d'); + +// Add plot to graph and send back to the client +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex7.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex7.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex7.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex7.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,67 @@ + array(1,15,7.5,2), + 5 => array(1,1,1.5,2), + 7 => array(1,2,10,3,2), + 8 => array(2,3,1,3,1,2), + ); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(590,580); +$graph->title->Set('Japanese locale'); +#$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); +$graph->title->SetColor('navy'); + +// Create the free windrose plot. +$wp = new WindrosePlot($data); +$wp->SetType(WINDROSE_TYPE8); + +// Add some "arbitrary" text to the center +$wp->scale->SetZeroLabel("SOx\n8%%"); + +// Localize the compass direction labels into Japanese +// Note: The labels for data must now also match the exact +// string for the compass directions. +// +// E   東 +// NE  北東 +// N   北 +// NW  北西 +// W   西 +// SW  南西 +// S   南 +// SE  南東 +$jp_CompassLbl = array('東','','北東','','北','','北西','', + '西','','南西','','南','','南東',''); +$wp->SetCompassLabels($jp_CompassLbl); +#$wp->SetFont(FF_MINCHO,FS_NORMAL,15); + +// Localize the "Calm" text into Swedish and make the circle +// slightly bigger than default +$jp_calmtext = '平穏'; +$wp->legend->SetCircleText($jp_calmtext); +$wp->legend->SetCircleRadius(20); +#$wp->legend->SetCFont(FF_MINCHO,FS_NORMAL,10); +$wp->legend->SetMargin(5,0); +$wp->SetPos(0.5, 0.5); + +// Adjust the displayed ranges +$ranges = array(1,3,5,8,12,19,29); +$wp->SetRanges($ranges); + +// Set the scale to always have max value of 30 +$wp->scale->Set(30,10); +#$wp->scale->SetFont(FF_VERA,FS_NORMAL,12); + +// Finally add it to the graph and send back to client +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex7.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex7.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex7.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex7.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,51 @@ + array(1,15,7.5,2), + 5 => array(1,1,1.5,2), + 7 => array(1,2,10,3,2), + 9 => array(2,3,1,3,1,2), + ); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,450); +$graph->title->Set('Windrose example 7'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); +$graph->title->SetColor('navy'); + +// Create the free windrose plot. +$wp = new WindrosePlot($data); +$wp->SetType(WINDROSE_TYPE16); + +// Add some "arbitrary" text to the center +$wp->scale->SetZeroLabel("SOx\n8%%"); + +// Localize the compass direction labels into Swedish +// Note: The labels for data must now also match the exact +// string for the compass directions. +$se_CompassLbl = array('O','ONO','NO','NNO','N','NNV','NV','VNV', + 'V','VSV','SV','SSV','S','SSO','SO','OSO'); +$wp->SetCompassLabels($se_CompassLbl); + +// Localize the "Calm" text into Swedish and make the circle +// slightly bigger than default +$se_calmtext = 'Lugnt'; +$wp->legend->SetCircleText($se_calmtext); +$wp->legend->SetCircleRadius(20); + +// Adjust the displayed ranges +$ranges = array(1,3,5,8,12,19,29); +$wp->SetRanges($ranges); +//$wp->SetAntiAlias(true); + +// Set the scale to always have max value of 30 with a step +// size of 12. +$wp->scale->Set(30,12); + +// Finally add it to the graph and send back to client +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex8.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex8.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex8.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex8.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,49 @@ + array(3,2,1,2,2), + 355 => array(1,1,1.5,2), + 180 => array(1,1,1.5,2), + 150 => array(1,2,1,3), + 'S' => array(2,3,5,1), + ); + +// Add some labels for afew of the directions +$labels = array(355=>"At\nHome base",180=>"Probe\n123",150=>"Power\nplant"); + +// Define the color,weight and style of some individual radial grid lines. +$axiscolors = array(355=>"red"); +$axisweights = array(355=>8); +$axisstyles = array(355=>'solid',150=>'solid'); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,460); +$graph->title->Set('Adding label backgrounds'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); +$graph->title->SetColor('navy'); + +// Create the free windrose plot. +$wp = new WindrosePlot($data); +$wp->SetType(WINDROSE_TYPEFREE); +$wp->scale->SetLabelFillColor('lightblue','black'); + +// Specify colors weights and style for the radial gridlines +$wp->SetRadialColors($axiscolors); +$wp->SetRadialWeights($axisweights); +$wp->SetRadialStyles($axisstyles); + +// Add a few labels +$wp->SetLabels($labels); + +// Add some "arbitrary" text to the center +$wp->scale->SetZeroLabel("SOx\n8%%"); + +// Finally add it to the graph and send back to client +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex8.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex8.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex8.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex8.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,48 @@ + array(3,2,1,2,2), + 355 => array(1,1,1.5,2), + 180 => array(1,1,1.5,2), + 150 => array(1,2,1,3), + 'S' => array(2,3,5,1), + ); + +// Add some labels for afew of the directions +$labels = array(355=>"At\nHome base",180=>"Probe\n123",150=>"Power\nplant"); + +// Define the color,weight and style of some individual radial grid lines. +$axiscolors = array(355=>"red"); +$axisweights = array(355=>8); +$axisstyles = array(355=>'solid',150=>'solid'); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,500); +$graph->title->Set('Windrose example 8'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); +$graph->title->SetColor('navy'); + +// Create the free windrose plot. +$wp = new WindrosePlot($data); +$wp->SetType(WINDROSE_TYPEFREE); + +// Specify colors weights and style for the radial gridlines +$wp->SetRadialColors($axiscolors); +$wp->SetRadialWeights($axisweights); +$wp->SetRadialStyles($axisstyles); + +// Add a few labels +$wp->SetLabels($labels); + +// Add some "arbitrary" text to the center +$wp->scale->SetZeroLabel("SOx\n8%%"); + +// Finally add it to the graph and send back to client +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex9.1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex9.1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex9.1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex9.1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,62 @@ + array(3,2,1,2,2), + 4 => array(1,1,1.5,2), + 6 => array(1,1,1.5,2), + 12 => array(2,3,5,1), +); + +$xpos1 = 0.26; +$xpos2 = 0.74; +$ypos1 = 0.5; +$ypos2 = 0.9; + +// First create a new windrose graph with a title +$graph = new WindroseGraph(650,350); +$graph->title->Set('Interpretation of ordinal keys'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); +$graph->title->SetColor('navy'); + +// Create the first plot +$wp1 = new WindrosePlot($data); +$wp1->SetType(WINDROSE_TYPE16); + +// This is the default encoding +$wp1->SetDataKeyEncoding(KEYENCODING_ANTICLOCKWISE); +$wp1->legend->Hide(); +$wp1->SetPos($xpos1,$ypos1); +$wp1->SetSize(0.5); + +// Create the second plot +$wp2 = new WindrosePlot($data); +$wp2->SetType(WINDROSE_TYPE16); +$wp2->SetDataKeyEncoding(KEYENCODING_CLOCKWISE); +$wp2->legend->Hide(); +$wp2->SetPos($xpos2,$ypos1); +$wp2->SetSize(0.5); + +$txt1 = new Text('KEYENCODING_ANTICLOCKWISE'); +$txt1->SetFont(FF_COURIER,FS_BOLD,12); +$txt1->SetPos($xpos1,$ypos2); +$txt1->SetAlign('center','top'); + +$txt2 = new Text('KEYENCODING_CLOCKWISE'); +$txt2->SetFont(FF_COURIER,FS_BOLD,12); +$txt2->SetPos($xpos2,$ypos2); +$txt2->SetAlign('center','top'); + +// Finally add it to the graph and send back to the client +$graph->Add($wp1); +$graph->Add($txt1); + +$graph->Add($wp2); +$graph->Add($txt2); + +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex9.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex9.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex9.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_ex9.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,46 @@ + array(3,2,1,2,2), + 'N' => array(1,1,1.5,2), + 'nw' => array(1,1,1.5,2), + 'S' => array(2,3,5,1), + ); + +// Define the color,weight and style of some individual radial +// grid lines. Axis can be specified either by their (localized) +// label or by their index. +// Note; Depending on how many axis you have in the plot the +// index will vary between 0..n where n is the number of +// compass directions. +$axiscolors = array('nw'=>'brown'); +$axisweights = array('nw'=>8); // Could also be specified as 6 => 8 +$axisstyles = array('nw'=>'solid'); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,500); +$graph->title->Set('Windrose example 9'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,14); +$graph->title->SetColor('navy'); + +// Create the free windrose plot. +$wp = new WindrosePlot($data); +$wp->SetType(WINDROSE_TYPE16); + +// Specify colors weights and style for the radial gridlines +$wp->SetRadialColors($axiscolors); +$wp->SetRadialWeights($axisweights); +$wp->SetRadialStyles($axisstyles); + +// Add some "arbitrary" text to the center +$wp->scale->SetZeroLabel("SOx\n8%%"); + +// Finally add it to the graph and send back to the client +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_icon_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_icon_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_icon_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_icon_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,33 @@ + array(1,1,2.5,4), + 1 => array(3,4,1,4), + 'wsw' => array(1,5,5,3), + 'N' => array(2,7,5,4,2), + 15 => array(2,7,12)); + +// First create a new windrose graph with a title +$graph = new WindroseGraph(400,400); + +// Creta an icon to be added to the graph +$icon = new IconPlot('tornado.jpg',10,10,1.3,50); +$icon->SetAnchor('left','top'); +$graph->Add($icon); + +// Setup title +$graph->title->Set('Windrose icon example'); +$graph->title->SetFont(FF_VERDANA,FS_BOLD,12); +$graph->title->SetColor('navy'); + +// Create the windrose plot. +$wp = new WindrosePlot($data); + +// Add to graph and send back to client +$graph->Add($wp); +$graph->Stroke(); +?> + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_layout_ex0.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_layout_ex0.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_layout_ex0.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_layout_ex0.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,45 @@ + array(10,10,13,7), + 2 => array(2,8,10), + 4 => array(1,12,22)), + array( + 4 => array(12,8,2,3), + 2 => array(5,4,4,5,2)), + array( + 1 => array(12,8,2,3), + 3 => array(5,4,4,5,2)), + array( + 2 => array(12,8,2,3), + 3 => array(5,4,4,5,2)), +); + +// Create a windrose graph with titles +$graph = new WindroseGraph(600,650); +$graph->SetShadow(); + +$graph->title->Set('Multiple plots with automatic layout'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +// Setup the individual windrose plots +$wp = array(); +for( $i=0; $i < 4; ++$i ) { + $wp[$i] = new WindrosePlot($data[$i]); + $wp[$i]->SetSize(0.22); + $wp[$i]->SetCenterSize(0.25); +} + +// Position with two rows. Two plots in top row and three plots in +// bottom row. +$hl1 = new LayoutHor( array( $wp[0], $wp[1] ) ); +$hl2 = new LayoutHor( array( $wp[2], $wp[3] ) ); +$vl = new LayoutVert( array( $hl1, $hl2) ); + +$graph->Add($vl); +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_layout_ex1.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_layout_ex1.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_layout_ex1.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/windrose_layout_ex1.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,58 @@ + array(10,10,13,7), + 2 => array(2,8,10), + 4 => array(1,12,22)), + array( + 4 => array(12,8,2,3), + 2 => array(5,4,4,5,2)), + array( + 1 => array(12,8,2,3), + 3 => array(5,4,4,5,2)), + array( + 2 => array(12,8,2,3), + 3 => array(5,4,4,5,2)), + array( + 4 => array(12,8,2,3), + 6 => array(5,4,4,5,2)) +); + +// Legend range colors +$rangecolors = array('green','yellow','red','brown'); + +// Create a windrose graph with titles +$graph = new WindroseGraph(750,700); + +$graph->title->Set('Multiple plots with automatic layout'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,14); + +// Setup the individual windrose plots +$wp = array(); +for( $i=0; $i < 5; ++$i ) { + $wp[$i] = new WindrosePlot($data[$i]); + $wp[$i]->SetType(WINDROSE_TYPE8); + if( $i < 2) { + $wp[$i]->SetSize(0.28); + } + else { + $wp[$i]->legend->Hide(); + $wp[$i]->SetSize(0.16); + $wp[$i]->SetCenterSize(0.25); + } + $wp[$i]->SetRangeColors($rangecolors); +} + +// Position with two rows. Two plots in top row and three plots in +// bottom row. +$hl1 = new LayoutHor( array( $wp[0], $wp[1] ) ); +$hl2 = new LayoutHor( array( $wp[2], $wp[3], $wp[4] ) ); +$vl = new LayoutVert( array( $hl1, $hl2) ); + +$graph->Add($vl); +$graph->Stroke(); +?> Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/worldmap1.jpg and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/worldmap1.jpg differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/y2synch2.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/y2synch2.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/y2synch2.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/y2synch2.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,60 @@ +SetMargin(50,60,40,45); +$graph->SetMarginColor('white'); + + +// Setup the scales for X,Y and Y2 axis +$graph->SetScale("textlin"); // X and Y axis +$graph->SetY2Scale("lin"); // Y2 axis + +// Overall graph title +$graph->title->Set('Synchronized Y & Y2 scales'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// Title for X-axis +$graph->xaxis->title->Set('Measurement'); +$graph->xaxis->title->SetMargin(5); +$graph->xaxis->title->SetFont(FF_ARIAL,FS_NORMAL,11); + +// Create Y data set +$lplot = new BarPlot($datay); +$graph->yaxis->title->Set('Celcius (C)'); +$graph->yaxis->title->SetMargin(5); +$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,11); +// ... and add the plot to the Y-axis +$graph->Add($lplot); + +// Create Y2 scale data set +$l2plot = new LinePlot($datay); +$l2plot->SetWeight(0); +$graph->y2axis->title->Set('Fahrenheit (F)'); +$graph->y2axis->title->SetMargin(5); // Some extra margin to clear labels +$graph->y2axis->title->SetFont(FF_ARIAL,FS_NORMAL,11); +$graph->y2axis->SetLabelFormatCallback('toFahrenheit'); +$graph->y2axis->SetColor('navy'); + +// ... and add the plot to the Y2-axis +$graph->AddY2($l2plot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/y2synch.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/y2synch.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/y2synch.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/y2synch.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,60 @@ +SetMargin(50,60,40,45); +$graph->SetMarginColor('white'); + + +// Setup the scales for X,Y and Y2 axis +$graph->SetScale("intlin"); // X and Y axis +$graph->SetY2Scale("lin"); // Y2 axis + +// Overall graph title +$graph->title->Set('Synchronized Y & Y2 scales'); +$graph->title->SetFont(FF_ARIAL,FS_BOLD,12); + +// Title for X-axis +$graph->xaxis->title->Set('Measurement'); +$graph->xaxis->title->SetMargin(5); +$graph->xaxis->title->SetFont(FF_ARIAL,FS_NORMAL,11); + +// Create Y data set +$lplot = new LinePlot($datay); +$graph->yaxis->title->Set('Celcius (C)'); +$graph->yaxis->title->SetMargin(5); +$graph->yaxis->title->SetFont(FF_ARIAL,FS_NORMAL,11); +// ... and add the plot to the Y-axis +$graph->Add($lplot); + +// Create Y2 scale data set +$l2plot = new LinePlot($datay); +$l2plot->SetWeight(0); +$graph->y2axis->title->Set('Fahrenheit (F)'); +$graph->y2axis->title->SetMargin(5); // Some extra margin to clear labels +$graph->y2axis->title->SetFont(FF_ARIAL,FS_NORMAL,11); +$graph->y2axis->SetLabelFormatCallback('toFahrenheit'); +$graph->y2axis->SetColor('navy'); + +// ... and add the plot to the Y2-axis +$graph->AddY2($l2plot); + +$graph->Stroke(); +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/yearssn.txt smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/yearssn.txt --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/Examples/yearssn.txt 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/Examples/yearssn.txt 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,309 @@ +1700.5 5.0 +1701.5 11.0 +1702.5 16.0 +1703.5 23.0 +1704.5 36.0 +1705.5 58.0 +1706.5 29.0 +1707.5 20.0 +1708.5 10.0 +1709.5 8.0 +1710.5 3.0 +1711.5 0.0 +1712.5 0.0 +1713.5 2.0 +1714.5 11.0 +1715.5 27.0 +1716.5 47.0 +1717.5 63.0 +1718.5 60.0 +1719.5 39.0 +1720.5 28.0 +1721.5 26.0 +1722.5 22.0 +1723.5 11.0 +1724.5 21.0 +1725.5 40.0 +1726.5 78.0 +1727.5 122.0 +1728.5 103.0 +1729.5 73.0 +1730.5 47.0 +1731.5 35.0 +1732.5 11.0 +1733.5 5.0 +1734.5 16.0 +1735.5 34.0 +1736.5 70.0 +1737.5 81.0 +1738.5 111.0 +1739.5 101.0 +1740.5 73.0 +1741.5 40.0 +1742.5 20.0 +1743.5 16.0 +1744.5 5.0 +1745.5 11.0 +1746.5 22.0 +1747.5 40.0 +1748.5 60.0 +1749.5 80.9 +1750.5 83.4 +1751.5 47.7 +1752.5 47.8 +1753.5 30.7 +1754.5 12.2 +1755.5 9.6 +1756.5 10.2 +1757.5 32.4 +1758.5 47.6 +1759.5 54.0 +1760.5 62.9 +1761.5 85.9 +1762.5 61.2 +1763.5 45.1 +1764.5 36.4 +1765.5 20.9 +1766.5 11.4 +1767.5 37.8 +1768.5 69.8 +1769.5 106.1 +1770.5 100.8 +1771.5 81.6 +1772.5 66.5 +1773.5 34.8 +1774.5 30.6 +1775.5 7.0 +1776.5 19.8 +1777.5 92.5 +1778.5 154.4 +1779.5 125.9 +1780.5 84.8 +1781.5 68.1 +1782.5 38.5 +1783.5 22.8 +1784.5 10.2 +1785.5 24.1 +1786.5 82.9 +1787.5 132.0 +1788.5 130.9 +1789.5 118.1 +1790.5 89.9 +1791.5 66.6 +1792.5 60.0 +1793.5 46.9 +1794.5 41.0 +1795.5 21.3 +1796.5 16.0 +1797.5 6.4 +1798.5 4.1 +1799.5 6.8 +1800.5 14.5 +1801.5 34.0 +1802.5 45.0 +1803.5 43.1 +1804.5 47.5 +1805.5 42.2 +1806.5 28.1 +1807.5 10.1 +1808.5 8.1 +1809.5 2.5 +1810.5 0.0 +1811.5 1.4 +1812.5 5.0 +1813.5 12.2 +1814.5 13.9 +1815.5 35.4 +1816.5 45.8 +1817.5 41.0 +1818.5 30.1 +1819.5 23.9 +1820.5 15.6 +1821.5 6.6 +1822.5 4.0 +1823.5 1.8 +1824.5 8.5 +1825.5 16.6 +1826.5 36.3 +1827.5 49.6 +1828.5 64.2 +1829.5 67.0 +1830.5 70.9 +1831.5 47.8 +1832.5 27.5 +1833.5 8.5 +1834.5 13.2 +1835.5 56.9 +1836.5 121.5 +1837.5 138.3 +1838.5 103.2 +1839.5 85.7 +1840.5 64.6 +1841.5 36.7 +1842.5 24.2 +1843.5 10.7 +1844.5 15.0 +1845.5 40.1 +1846.5 61.5 +1847.5 98.5 +1848.5 124.7 +1849.5 96.3 +1850.5 66.6 +1851.5 64.5 +1852.5 54.1 +1853.5 39.0 +1854.5 20.6 +1855.5 6.7 +1856.5 4.3 +1857.5 22.7 +1858.5 54.8 +1859.5 93.8 +1860.5 95.8 +1861.5 77.2 +1862.5 59.1 +1863.5 44.0 +1864.5 47.0 +1865.5 30.5 +1866.5 16.3 +1867.5 7.3 +1868.5 37.6 +1869.5 74.0 +1870.5 139.0 +1871.5 111.2 +1872.5 101.6 +1873.5 66.2 +1874.5 44.7 +1875.5 17.0 +1876.5 11.3 +1877.5 12.4 +1878.5 3.4 +1879.5 6.0 +1880.5 32.3 +1881.5 54.3 +1882.5 59.7 +1883.5 63.7 +1884.5 63.5 +1885.5 52.2 +1886.5 25.4 +1887.5 13.1 +1888.5 6.8 +1889.5 6.3 +1890.5 7.1 +1891.5 35.6 +1892.5 73.0 +1893.5 85.1 +1894.5 78.0 +1895.5 64.0 +1896.5 41.8 +1897.5 26.2 +1898.5 26.7 +1899.5 12.1 +1900.5 9.5 +1901.5 2.7 +1902.5 5.0 +1903.5 24.4 +1904.5 42.0 +1905.5 63.5 +1906.5 53.8 +1907.5 62.0 +1908.5 48.5 +1909.5 43.9 +1910.5 18.6 +1911.5 5.7 +1912.5 3.6 +1913.5 1.4 +1914.5 9.6 +1915.5 47.4 +1916.5 57.1 +1917.5 103.9 +1918.5 80.6 +1919.5 63.6 +1920.5 37.6 +1921.5 26.1 +1922.5 14.2 +1923.5 5.8 +1924.5 16.7 +1925.5 44.3 +1926.5 63.9 +1927.5 69.0 +1928.5 77.8 +1929.5 64.9 +1930.5 35.7 +1931.5 21.2 +1932.5 11.1 +1933.5 5.7 +1934.5 8.7 +1935.5 36.1 +1936.5 79.7 +1937.5 114.4 +1938.5 109.6 +1939.5 88.8 +1940.5 67.8 +1941.5 47.5 +1942.5 30.6 +1943.5 16.3 +1944.5 9.6 +1945.5 33.2 +1946.5 92.6 +1947.5 151.6 +1948.5 136.3 +1949.5 134.7 +1950.5 83.9 +1951.5 69.4 +1952.5 31.5 +1953.5 13.9 +1954.5 4.4 +1955.5 38.0 +1956.5 141.7 +1957.5 190.2 +1958.5 184.8 +1959.5 159.0 +1960.5 112.3 +1961.5 53.9 +1962.5 37.6 +1963.5 27.9 +1964.5 10.2 +1965.5 15.1 +1966.5 47.0 +1967.5 93.7 +1968.5 105.9 +1969.5 105.5 +1970.5 104.5 +1971.5 66.6 +1972.5 68.9 +1973.5 38.0 +1974.5 34.5 +1975.5 15.5 +1976.5 12.6 +1977.5 27.5 +1978.5 92.5 +1979.5 155.4 +1980.5 154.6 +1981.5 140.5 +1982.5 115.9 +1983.5 66.6 +1984.5 45.9 +1985.5 17.9 +1986.5 13.4 +1987.5 29.2 +1988.5 100.2 +1989.5 157.6 +1990.5 142.6 +1991.5 145.7 +1992.5 94.3 +1993.5 54.6 +1994.5 29.9 +1995.5 17.5 +1996.5 8.6 +1997.5 21.5 +1998.5 64.3 +1999.5 93.3 +2000.5 119.6 +2001.5 111.0 +2002.5 104.0 +2003.5 63.7 +2004.5 40.4 +2005.5 29.8 +2006.5 15.2 +2007.5 7.5 +2008.5 2.9 Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/fonts/DejaVuSans-BoldOblique.ttf and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/fonts/DejaVuSans-BoldOblique.ttf differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/fonts/DejaVuSans-Bold.ttf and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/fonts/DejaVuSans-Bold.ttf differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/fonts/DejaVuSans-Oblique.ttf and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/fonts/DejaVuSans-Oblique.ttf differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/fonts/DejaVuSans.ttf and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/fonts/DejaVuSans.ttf differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT0-Bold.gdf and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT0-Bold.gdf differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT0.gdf and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT0.gdf differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT1-Bold.gdf and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT1-Bold.gdf differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT1.gdf and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT1.gdf differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT2-Bold.gdf and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT2-Bold.gdf differ Binary files smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT2.gdf and smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/fonts/FF_FONT2.gdf differ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/gd_image.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/gd_image.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/gd_image.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/gd_image.inc.php 2020-09-09 09:04:03.000000000 +0100 @@ -5,11 +5,13 @@ // Created: 2001-01-08, refactored 2008-03-29 // Ver: $Id: gd_image.inc.php 1922 2010-01-11 11:42:50Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== require_once 'jpgraph_rgb.inc.php'; require_once 'jpgraph_ttf.inc.php'; +require_once 'imageSmoothArc.php'; +require_once 'jpgraph_errhandler.inc.php'; // Line styles define('LINESTYLE_SOLID',1); @@ -33,19 +35,25 @@ // rotation. //========================================================================= class Image { - public $left_margin=30,$right_margin=30,$top_margin=20,$bottom_margin=30; public $img=null; - public $plotwidth=0,$plotheight=0; - public $width=0, $height=0; public $rgb=null; - public $current_color,$current_color_name; - public $line_weight=1, $line_style=LINESTYLE_SOLID; public $img_format; public $ttf=null; + public $line_style=LINESTYLE_SOLID; + public $current_color,$current_color_name; + public $original_width=0, $original_height=0; + public $plotwidth=0,$plotheight=0; + + // for __get, __set + private $_left_margin=30,$_right_margin=30,$_top_margin=20,$_bottom_margin=30; + //private $_plotwidth=0,$_plotheight=0; + private $_width=0, $_height=0; + private $_line_weight=1; + protected $expired=true; protected $lastx=0, $lasty=0; protected $obs_list=array(); - protected $font_size=12,$font_family=FF_FONT1, $font_style=FS_NORMAL; + protected $font_size=12,$font_family=FF_DEFAULT, $font_style=FS_NORMAL; protected $font_file=''; protected $text_halign="left",$text_valign="bottom"; protected $use_anti_aliasing=false; @@ -55,11 +63,21 @@ protected $langconv = null ; protected $iInterlace=false; protected $bbox_cache = array(); // STore the last found tetx bounding box + protected $ff_font0; + protected $ff_font0_bold; + protected $ff_font1; + protected $ff_font1_bold; + protected $ff_font2; + protected $ff_font2_bold; + //--------------- // CONSTRUCTOR function __construct($aWidth=0,$aHeight=0,$aFormat=DEFAULT_GFORMAT,$aSetAutoMargin=true) { - $this->CreateImgCanvas($aWidth,$aHeight); + + $this->original_width = $aWidth; + $this->original_height = $aHeight; + $this->CreateImgCanvas($aWidth, $aHeight); if( $aSetAutoMargin ) { $this->SetAutoMargin(); @@ -70,6 +88,12 @@ } $this->ttf = new TTF(); $this->langconv = new LanguageConv(); + + $this->ff_font0 = imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT0.gdf"); + $this->ff_font1 = imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT1.gdf"); + $this->ff_font2 = imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT2.gdf"); + $this->ff_font1_bold = imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT1-Bold.gdf"); + $this->ff_font2_bold = imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT2-Bold.gdf"); } // Enable interlacing in images @@ -93,6 +117,10 @@ } function CreateRawCanvas($aWidth=0,$aHeight=0) { + + $aWidth *= SUPERSAMPLING_SCALE; + $aHeight *= SUPERSAMPLING_SCALE; + if( $aWidth <= 1 || $aHeight <= 1 ) { JpGraphError::RaiseL(25082,$aWidth,$aHeight);//("Illegal sizes specified for width or height when creating an image, (width=$aWidth, height=$aHeight)"); } @@ -146,7 +174,7 @@ // Set canvas color (will also be the background color for a // a pallett image $this->SetColor($this->canvascolor); - $this->FilledRectangle(0,0,$aWidth-1,$aHeight-1); + $this->FilledRectangle(0,0,$this->width-1,$this->height-1); return $old ; } @@ -192,17 +220,11 @@ } } - static function GetWidth($aImg=null) { - if( $aImg === null ) { - $aImg = $this->img; - } + static function GetWidth($aImg) { return imagesx($aImg); } - static function GetHeight($aImg=null) { - if( $aImg === null ) { - $aImg = $this->img; - } + static function GetHeight($aImg) { return imagesy($aImg); } @@ -243,7 +265,7 @@ function SetFont($family,$style=FS_NORMAL,$size=10) { $this->font_family=$family; $this->font_style=$style; - $this->font_size=$size; + $this->font_size=$size*SUPERSAMPLING_SCALE; $this->font_file=''; if( ($this->font_family==FF_FONT1 || $this->font_family==FF_FONT2) && $this->font_style==FS_BOLD ){ ++$this->font_family; @@ -252,9 +274,12 @@ // Check that this PHP has support for TTF fonts if( !function_exists('imagettfbbox') ) { - JpGraphError::RaiseL(25087);//('This PHP build has not been configured with TTF support. You need to recompile your PHP installation with FreeType support.'); + // use internal font when php is configured without '--with-ttf' + $this->font_family = FF_FONT1; +// JpGraphError::RaiseL(25087);//('This PHP build has not been configured with TTF support. You need to recompile your PHP installation with FreeType support.'); + } else { + $this->font_file = $this->ttf->File($this->font_family,$this->font_style); } - $this->font_file = $this->ttf->File($this->font_family,$this->font_style); } } @@ -620,8 +645,10 @@ $y += $dir==0 ? $h/2 : $w/2; } + $use_font = $this->font_family; + if( $dir==90 ) { - imagestringup($this->img,$this->font_family,$x,$y,$txt,$this->current_color); + imagestringup($this->img,$use_font,$x,$y,$txt,$this->current_color); $aBoundingBox = array(round($x),round($y),round($x),round($y-$w),round($x+$h),round($y-$w),round($x+$h),round($y)); if( $aDebug ) { // Draw bounding box @@ -636,19 +663,19 @@ for($i=0; $i < count($tmp); ++$i) { $w1 = $this->GetTextWidth($tmp[$i]); if( $paragraph_align=="left" ) { - imagestring($this->img,$this->font_family,$x,$y-$h+1+$i*$fh,$tmp[$i],$this->current_color); + imagestring($this->img,$use_font,$x,$y-$h+1+$i*$fh,$tmp[$i],$this->current_color); } elseif( $paragraph_align=="right" ) { - imagestring($this->img,$this->font_family,$x+($w-$w1),$y-$h+1+$i*$fh,$tmp[$i],$this->current_color); + imagestring($this->img,$use_font,$x+($w-$w1),$y-$h+1+$i*$fh,$tmp[$i],$this->current_color); } else { - imagestring($this->img,$this->font_family,$x+$w/2-$w1/2,$y-$h+1+$i*$fh,$tmp[$i],$this->current_color); + imagestring($this->img,$use_font,$x+$w/2-$w1/2,$y-$h+1+$i*$fh,$tmp[$i],$this->current_color); } } } else { //Put the text - imagestring($this->img,$this->font_family,$x,$y-$h+1,$txt,$this->current_color); + imagestring($this->img,$use_font,$x,$y-$h+1,$txt,$this->current_color); } if( $aDebug ) { // Draw the bounding rectangle and the bounding box @@ -1075,12 +1102,15 @@ } function SetMargin($lm,$rm,$tm,$bm) { + $this->left_margin=$lm; $this->right_margin=$rm; $this->top_margin=$tm; $this->bottom_margin=$bm; - $this->plotwidth=$this->width - $this->left_margin-$this->right_margin ; - $this->plotheight=$this->height - $this->top_margin-$this->bottom_margin ; + + $this->plotwidth = $this->width - $this->left_margin - $this->right_margin; + $this->plotheight = $this->height - $this->top_margin - $this->bottom_margin; + if( $this->width > 0 && $this->height > 0 ) { if( $this->plotwidth < 0 || $this->plotheight < 0 ) { JpGraphError::RaiseL(25130, $this->plotwidth, $this->plotheight); @@ -1126,7 +1156,7 @@ function SetLineWeight($weight) { - $old = $this->line_weight; + $old = $this->line_weight; imagesetthickness($this->img,$weight); $this->line_weight = $weight; return $old; @@ -1153,6 +1183,7 @@ $style=IMG_ARC_PIE; if( abs($s-$e) > 0 ) { imagefilledarc($this->img,round($xc),round($yc),round($w),round($h),$s,$e,$this->current_color,$style); +// $this->DrawImageSmoothArc($this->img,round($xc),round($yc),round($w),round($h),$s,$e,$this->current_color,$style); } } @@ -1200,10 +1231,13 @@ function Circle($xc,$yc,$r) { imageellipse($this->img,round($xc),round($yc),$r*2,$r*2,$this->current_color); +// $this->DrawImageSmoothArc($this->img,round($xc),round($yc),$r*2+1,$r*2+1,0,360,$this->current_color); +// $this->imageSmoothCircle($this->img, round($xc),round($yc), $r*2+1, $this->current_color); } function FilledCircle($xc,$yc,$r) { imagefilledellipse($this->img,round($xc),round($yc),2*$r,2*$r,$this->current_color); +// $this->DrawImageSmoothArc($this->img, round($xc), round($yc), 2*$r, 2*$r, 0, 360, $this->current_color); } // Linear Color InterPolation @@ -1240,13 +1274,18 @@ } // Same as Line but take the line_style into account - function StyleLine($x1,$y1,$x2,$y2,$aStyle='') { + function StyleLine($x1,$y1,$x2,$y2,$aStyle='', $from_grid_class = false) { if( $this->line_weight <= 0 ) return; if( $aStyle === '' ) { $aStyle = $this->line_style; } + $dashed_line_method = 'DashedLine'; + if ($from_grid_class) { + $dashed_line_method = 'DashedLineForGrid'; + } + // Add error check since dashed line will only work if anti-alias is disabled // this is a limitation in GD @@ -1265,13 +1304,13 @@ switch( $aStyle ) { case 2: // Dotted - $this->DashedLine($x1,$y1,$x2,$y2,2,6); + $this->$dashed_line_method($x1,$y1,$x2,$y2,2,6); break; case 3: // Dashed - $this->DashedLine($x1,$y1,$x2,$y2,5,9); + $this->$dashed_line_method($x1,$y1,$x2,$y2,5,9); break; case 4: // Longdashes - $this->DashedLine($x1,$y1,$x2,$y2,9,13); + $this->$dashed_line_method($x1,$y1,$x2,$y2,9,13); break; default: JpGraphError::RaiseL(25104,$this->line_style);//(" Unknown line style: $this->line_style "); @@ -1291,19 +1330,55 @@ // Dashed line does not work with anti-alias enabled. This // is a limitation in GD. if( $this->use_anti_aliasing ) { - JpGraphError::RaiseL(25129); // Anti-alias can not be used with dashed lines. Please disable anti-alias or use solid lines. +// JpGraphError::RaiseL(25129); // Anti-alias can not be used with dashed lines. Please disable anti-alias or use solid lines. } - - + $x1 = round($x1); $x2 = round($x2); $y1 = round($y1); $y2 = round($y2); + $dash_length *= SUPERSAMPLING_SCALE; + $dash_space *= SUPERSAMPLING_SCALE; + $style = array_fill(0,$dash_length,$this->current_color); $style = array_pad($style,$dash_space,IMG_COLOR_TRANSPARENT); imagesetstyle($this->img, $style); imageline($this->img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED); + + $this->lastx = $x2; + $this->lasty = $y2; + } + + function DashedLineForGrid($x1,$y1,$x2,$y2,$dash_length=1,$dash_space=4) { + + if( $this->line_weight <= 0 ) return; + + // Add error check to make sure anti-alias is not enabled. + // Dashed line does not work with anti-alias enabled. This + // is a limitation in GD. + if( $this->use_anti_aliasing ) { +// JpGraphError::RaiseL(25129); // Anti-alias can not be used with dashed lines. Please disable anti-alias or use solid lines. + } + + $x1 = round($x1); + $x2 = round($x2); + $y1 = round($y1); + $y2 = round($y2); + + /* + $dash_length *= $this->scale; + $dash_space *= $this->scale; + */ + + $dash_length = 2; + $dash_length = 4; + imagesetthickness($this->img, 1); + $style = array_fill(0,$dash_length, $this->current_color); //hexdec('CCCCCC')); + $style = array_pad($style,$dash_space,IMG_COLOR_TRANSPARENT); + imagesetstyle($this->img, $style); + imageline($this->img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED); + $this->lastx = $x2; $this->lasty = $y2; } @@ -1318,6 +1393,7 @@ $y2 = round($y2); imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color); +// $this->DrawLine($this->img, $x1, $y1, $x2, $y2, $this->line_weight, $this->current_color); $this->lastx=$x2; $this->lasty=$y2; } @@ -1579,13 +1655,24 @@ } // Stream image to browser or to file - function Stream($aFile="") { + function Stream($aFile=NULL) { + $this->DoSupersampling(); + $func="image".$this->img_format; if( $this->img_format=="jpeg" && $this->quality != null ) { $res = @$func($this->img,$aFile,$this->quality); - } + + if(!$res){ + if($aFile != NULL){ + JpGraphError::RaiseL(25107,$aFile);//("Can't write to file '$aFile'. Check that the process running PHP has enough permission."); + }else{ + JpGraphError::RaiseL(25108);//("Can't stream image. This is most likely due to a faulty PHP/GD setup. Try to recompile PHP and use the built-in GD library that comes with PHP."); + } + + } + } else { - if( $aFile != "" ) { + if( $aFile != NULL ) { $res = @$func($this->img,$aFile); if( !$res ) { JpGraphError::RaiseL(25107,$aFile);//("Can't write to file '$aFile'. Check that the process running PHP has enough permission."); @@ -1601,6 +1688,18 @@ } } + // Do SuperSampling using $scale + function DoSupersampling() { + if (SUPERSAMPLING_SCALE <= 1) { + return $this->img; + } + + $dst_img = @imagecreatetruecolor($this->original_width, $this->original_height); + imagecopyresampled($dst_img, $this->img, 0, 0, 0, 0, $this->original_width, $this->original_height, $this->width, $this->height); + $this->Destroy(); + return $this->img = $dst_img; + } + // Clear resources used by image (this is normally not used since all resources are/should be // returned when the script terminates function Destroy() { @@ -1645,6 +1744,194 @@ } } } + + /** + * Draw Line + */ + function DrawLine($im, $x1, $y1, $x2, $y2, $weight, $color) { + if ($weight == 1) { + return imageline($im,$x1,$y1,$x2,$y2,$color); + } + + $angle=(atan2(($y1 - $y2), ($x2 - $x1))); + + $dist_x = $weight * (sin($angle)) / 2; + $dist_y = $weight * (cos($angle)) / 2; + + $p1x=ceil(($x1 + $dist_x)); + $p1y=ceil(($y1 + $dist_y)); + $p2x=ceil(($x2 + $dist_x)); + $p2y=ceil(($y2 + $dist_y)); + $p3x=ceil(($x2 - $dist_x)); + $p3y=ceil(($y2 - $dist_y)); + $p4x=ceil(($x1 - $dist_x)); + $p4y=ceil(($y1 - $dist_y)); + + $array=array($p1x,$p1y,$p2x,$p2y,$p3x,$p3y,$p4x,$p4y); + imagefilledpolygon ( $im, $array, (count($array)/2), $color ); + + // for antialias + imageline($im, $p1x, $p1y, $p2x, $p2y, $color); + imageline($im, $p3x, $p3y, $p4x, $p4y, $color); + return; + + + + return imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color); + $weight = 8; + if ($weight <= 1) { + return imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color); + } + + $pts = array(); + + $weight /= 2; + + if ($y2 - $y1 == 0) { + // x line + $pts = array(); + $pts[] = $x1; $pts[] = $y1 - $weight; + $pts[] = $x1; $pts[] = $y1 + $weight; + $pts[] = $x2; $pts[] = $y2 + $weight; + $pts[] = $x2; $pts[] = $y2 - $weight; + + } elseif ($x2 - $x1 == 0) { + // y line + $pts = array(); + $pts[] = $x1 - $weight; $pts[] = $y1; + $pts[] = $x1 + $weight; $pts[] = $y1; + $pts[] = $x2 + $weight; $pts[] = $y2; + $pts[] = $x2 - $weight; $pts[] = $y2; + + } else { + + var_dump($x1, $x2, $y1, $y2); + $length = sqrt(pow($x2 - $x1, 2) + pow($y2 - $y1, 2)); + var_dump($length);exit; + exit; + +/* + $lean = ($y2 - $y1) / ($x2 - $x1); + $lean2 = -1 / $lean; + $sin = $lean / ($y2 - $y1); + $cos = $lean / ($x2 - $x1); + + $pts[] = $x1 + (-$weight * $sin); $pts[] = $y1 + (-$weight * $cos); + $pts[] = $x1 + (+$weight * $sin); $pts[] = $y1 + (+$weight * $cos); + $pts[] = $x2 + (+$weight * $sin); $pts[] = $y2 + (+$weight * $cos); + $pts[] = $x2 + (-$weight * $sin); $pts[] = $y2 + (-$weight * $cos); +*/ + } + +//print_r($pts);exit; + if (count($pts)/2 < 3) { + return; + } + + imagesetthickness($im, 1); + imagefilledpolygon($im, $pts,count($pts)/2, $color); + + + $weight *= 2; + +// $this->DrawImageSmoothArc($im, $x1, $y1, $weight, $weight, 0, 360, $color); +// $this->DrawImageSmoothArc($im, $x2, $y2, $weight, $weight, 0, 360, $color); + } + + + function DrawImageSmoothArc($im, $xc, $yc, $w, $h, $s, $e, $color, $style = null) { + $tmp = $s; + $s = (360 - $e) / 180 * M_PI; + $e = (360 - $tmp) / 180 * M_PI; + return imageSmoothArc($im, round($xc), round($yc), round($w), round($h), $this->CreateColorForImageSmoothArc($color), $s, $e); + } + + function CreateColorForImageSmoothArc($color) { + $alpha = $color >> 24 & 0xFF; + $red = $color >> 16 & 0xFF; + $green = $color >> 8 & 0xFF; + $blue = $color & 0xFF; + +//var_dump($alpha, $red, $green, $blue);exit; + + return array($red, $green, $blue, $alpha); + } + + function imageSmoothCircle( &$img, $cx, $cy, $cr, $color ) { + $ir = $cr; + $ix = 0; + $iy = $ir; + $ig = 2 * $ir - 3; + $idgr = -6; + $idgd = 4 * $ir - 10; + $fill = imageColorExactAlpha( $img, $color[ 'R' ], $color[ 'G' ], $color[ 'B' ], 0 ); + imageLine( $img, $cx + $cr - 1, $cy, $cx, $cy, $fill ); + imageLine( $img, $cx - $cr + 1, $cy, $cx - 1, $cy, $fill ); + imageLine( $img, $cx, $cy + $cr - 1, $cx, $cy + 1, $fill ); + imageLine( $img, $cx, $cy - $cr + 1, $cx, $cy - 1, $fill ); + $draw = imageColorExactAlpha( $img, $color[ 'R' ], $color[ 'G' ], $color[ 'B' ], 42 ); + imageSetPixel( $img, $cx + $cr, $cy, $draw ); + imageSetPixel( $img, $cx - $cr, $cy, $draw ); + imageSetPixel( $img, $cx, $cy + $cr, $draw ); + imageSetPixel( $img, $cx, $cy - $cr, $draw ); + while ( $ix <= $iy - 2 ) { + if ( $ig < 0 ) { + $ig += $idgd; + $idgd -= 8; + $iy--; + } else { + $ig += $idgr; + $idgd -= 4; + } + $idgr -= 4; + $ix++; + imageLine( $img, $cx + $ix, $cy + $iy - 1, $cx + $ix, $cy + $ix, $fill ); + imageLine( $img, $cx + $ix, $cy - $iy + 1, $cx + $ix, $cy - $ix, $fill ); + imageLine( $img, $cx - $ix, $cy + $iy - 1, $cx - $ix, $cy + $ix, $fill ); + imageLine( $img, $cx - $ix, $cy - $iy + 1, $cx - $ix, $cy - $ix, $fill ); + imageLine( $img, $cx + $iy - 1, $cy + $ix, $cx + $ix, $cy + $ix, $fill ); + imageLine( $img, $cx + $iy - 1, $cy - $ix, $cx + $ix, $cy - $ix, $fill ); + imageLine( $img, $cx - $iy + 1, $cy + $ix, $cx - $ix, $cy + $ix, $fill ); + imageLine( $img, $cx - $iy + 1, $cy - $ix, $cx - $ix, $cy - $ix, $fill ); + $filled = 0; + for ( $xx = $ix - 0.45; $xx < $ix + 0.5; $xx += 0.2 ) { + for ( $yy = $iy - 0.45; $yy < $iy + 0.5; $yy += 0.2 ) { + if ( sqrt( pow( $xx, 2 ) + pow( $yy, 2 ) ) < $cr ) $filled += 4; + } + } + $draw = imageColorExactAlpha( $img, $color[ 'R' ], $color[ 'G' ], $color[ 'B' ], ( 100 - $filled ) ); + imageSetPixel( $img, $cx + $ix, $cy + $iy, $draw ); + imageSetPixel( $img, $cx + $ix, $cy - $iy, $draw ); + imageSetPixel( $img, $cx - $ix, $cy + $iy, $draw ); + imageSetPixel( $img, $cx - $ix, $cy - $iy, $draw ); + imageSetPixel( $img, $cx + $iy, $cy + $ix, $draw ); + imageSetPixel( $img, $cx + $iy, $cy - $ix, $draw ); + imageSetPixel( $img, $cx - $iy, $cy + $ix, $draw ); + imageSetPixel( $img, $cx - $iy, $cy - $ix, $draw ); + } + } + + function __get($name) { + + if (strpos($name, 'raw_') !== false) { + // if $name == 'raw_left_margin' , return $this->_left_margin; + $variable_name = '_' . str_replace('raw_', '', $name); + return $this->$variable_name; + } + + $variable_name = '_' . $name; + + if (isset($this->$variable_name)) { + return $this->$variable_name * SUPERSAMPLING_SCALE; + } else { + JpGraphError::RaiseL('25132', $name); + } + } + + function __set($name, $value) { + $this->{'_'.$name} = $value; + } + } // CLASS //=================================================== @@ -1659,8 +1946,8 @@ function __construct($aWidth,$aHeight,$a=0,$aFormat=DEFAULT_GFORMAT,$aSetAutoMargin=true) { parent::__construct($aWidth,$aHeight,$aFormat,$aSetAutoMargin); - $this->dx=$this->left_margin+$this->plotwidth/2; - $this->dy=$this->top_margin+$this->plotheight/2; + $this->dx=$this->width/2; + $this->dy=$this->height/2; $this->SetAngle($a); } @@ -1727,8 +2014,6 @@ function SetMargin($lm,$rm,$tm,$bm) { parent::SetMargin($lm,$rm,$tm,$bm); - $this->dx=$this->left_margin+$this->plotwidth/2; - $this->dy=$this->top_margin+$this->plotheight/2; $this->UpdateRotMatrice(); } @@ -1979,7 +2264,7 @@ // image file doesn't exist or exists but is to old function GetAndStream($aImage,$aCacheFileName) { if( $this->Isvalid($aCacheFileName) ) { - $this->StreamImgFile($aImage,$aCacheFileName); + return $this->StreamImgFile($aImage,$aCacheFileName); } else { return false; diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imageSmoothArc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imageSmoothArc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imageSmoothArc.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imageSmoothArc.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,344 @@ += abs($yStart)) { + $aaStartX = true; + } else { + $aaStartX = false; + } + if ($xStop >= $yStop) { + $aaStopX = true; + } else { + $aaStopX = false; + } + //$xp = +1; $yp = -1; $xa = +1; $ya = 0; + for ( $x = 0; $x < $a; $x += 1 ) { + /*$y = $b * sqrt( 1 - ($x*$x)/($a*$a) ); + + $error = $y - (int)($y); + $y = (int)($y); + + $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );*/ + + $_y1 = $dyStop*$x; + $_y2 = $dyStart*$x; + if ($xStart > $xStop) + { + $error1 = $_y1 - (int)($_y1); + $error2 = 1 - $_y2 + (int)$_y2; + $_y1 = $_y1-$error1; + $_y2 = $_y2+$error2; + } + else + { + $error1 = 1 - $_y1 + (int)$_y1; + $error2 = $_y2 - (int)($_y2); + $_y1 = $_y1+$error1; + $_y2 = $_y2-$error2; + } + /* + if ($aaStopX) + $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 ); + if ($aaStartX) + $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 ); + */ + + if ($seg == 0 || $seg == 2) + { + $i = $seg; + if (!($start > $i*M_PI/2 && $x > $xStart)) { + if ($i == 0) { + $xp = +1; $yp = -1; $xa = +1; $ya = 0; + } else { + $xp = -1; $yp = +1; $xa = 0; $ya = +1; + } + if ( $stop < ($i+1)*(M_PI/2) && $x <= $xStop ) { + $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 ); + $y1 = $_y1; if ($aaStopX) imageSetPixel($img, $cx+$xp*($x)+$xa, $cy+$yp*($y1+1)+$ya, $diffColor1); + + } else { + $y = $b * sqrt( 1 - ($x*$x)/($a*$a) ); + $error = $y - (int)($y); + $y = (int)($y); + $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error ); + $y1 = $y; if ($x < $aaAngleX ) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y1+1)+$ya, $diffColor); + } + if ($start > $i*M_PI/2 && $x <= $xStart) { + $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 ); + $y2 = $_y2; if ($aaStartX) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y2-1)+$ya, $diffColor2); + } else { + $y2 = 0; + } + if ($y2 <= $y1) imageLine($img, $cx+$xp*$x+$xa, $cy+$yp*$y1+$ya , $cx+$xp*$x+$xa, $cy+$yp*$y2+$ya, $fillColor); + } + } + + if ($seg == 1 || $seg == 3) + { + $i = $seg; + if (!($stop < ($i+1)*M_PI/2 && $x > $xStop)) { + if ($i == 1) { + $xp = -1; $yp = -1; $xa = 0; $ya = 0; + } else { + $xp = +1; $yp = +1; $xa = 1; $ya = 1; + } + if ( $start > $i*M_PI/2 && $x < $xStart ) { + $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 ); + $y1 = $_y2; if ($aaStartX) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y1+1)+$ya, $diffColor2); + + } else { + $y = $b * sqrt( 1 - ($x*$x)/($a*$a) ); + $error = $y - (int)($y); + $y = (int) $y; + $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error ); + $y1 = $y; if ($x < $aaAngleX ) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y1+1)+$ya, $diffColor); + } + if ($stop < ($i+1)*M_PI/2 && $x <= $xStop) { + $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 ); + $y2 = $_y1; if ($aaStopX) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y2-1)+$ya, $diffColor1); + } else { + $y2 = 0; + } + if ($y2 <= $y1) imageLine($img, $cx+$xp*$x+$xa, $cy+$yp*$y1+$ya, $cx+$xp*$x+$xa, $cy+$yp*$y2+$ya, $fillColor); + } + } + } + + ///YYYYY + + for ( $y = 0; $y < $b; $y += 1 ) { + /*$x = $a * sqrt( 1 - ($y*$y)/($b*$b) ); + + $error = $x - (int)($x); + $x = (int)($x); + + $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error ); + */ + $_x1 = $dxStop*$y; + $_x2 = $dxStart*$y; + if ($yStart > $yStop) + { + $error1 = $_x1 - (int)($_x1); + $error2 = 1 - $_x2 + (int)$_x2; + $_x1 = $_x1-$error1; + $_x2 = $_x2+$error2; + } + else + { + $error1 = 1 - $_x1 + (int)$_x1; + $error2 = $_x2 - (int)($_x2); + $_x1 = $_x1+$error1; + $_x2 = $_x2-$error2; + } +/* + if (!$aaStopX) + $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 ); + if (!$aaStartX) + $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 ); +*/ + + if ($seg == 0 || $seg == 2) + { + $i = $seg; + if (!($start > $i*M_PI/2 && $y > $yStop)) { + if ($i == 0) { + $xp = +1; $yp = -1; $xa = 1; $ya = 0; + } else { + $xp = -1; $yp = +1; $xa = 0; $ya = 1; + } + if ( $stop < ($i+1)*(M_PI/2) && $y <= $yStop ) { + $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 ); + $x1 = $_x1; if (!$aaStopX) imageSetPixel($img, $cx+$xp*($x1-1)+$xa, $cy+$yp*($y)+$ya, $diffColor1); + } + if ($start > $i*M_PI/2 && $y < $yStart) { + $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 ); + $x2 = $_x2; if (!$aaStartX) imageSetPixel($img, $cx+$xp*($x2+1)+$xa, $cy+$yp*($y)+$ya, $diffColor2); + } else { + $x = $a * sqrt( 1 - ($y*$y)/($b*$b) ); + $error = $x - (int)($x); + $x = (int)($x); + $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error ); + $x1 = $x; if ($y < $aaAngleY && $y <= $yStop ) imageSetPixel($img, $cx+$xp*($x1+1)+$xa, $cy+$yp*$y+$ya, $diffColor); + } + } + } + + if ($seg == 1 || $seg == 3) + { + $i = $seg; + if (!($stop < ($i+1)*M_PI/2 && $y > $yStart)) { + if ($i == 1) { + $xp = -1; $yp = -1; $xa = 0; $ya = 0; + } else { + $xp = +1; $yp = +1; $xa = 1; $ya = 1; + } + if ( $start > $i*M_PI/2 && $y < $yStart ) { + $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 ); + $x1 = $_x2; if (!$aaStartX) imageSetPixel($img, $cx+$xp*($x1-1)+$xa, $cy+$yp*$y+$ya, $diffColor2); + } + if ($stop < ($i+1)*M_PI/2 && $y <= $yStop) { + $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 ); + $x2 = $_x1; if (!$aaStopX) imageSetPixel($img, $cx+$xp*($x2+1)+$xa, $cy+$yp*$y+$ya, $diffColor1); + } else { + $x = $a * sqrt( 1 - ($y*$y)/($b*$b) ); + $error = $x - (int)($x); + $x = (int)($x); + $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error ); + $x1 = $x; if ($y < $aaAngleY && $y < $yStart) imageSetPixel($img,$cx+$xp*($x1+1)+$xa, $cy+$yp*$y+$ya, $diffColor); + } + } + } + } +} + + +function imageSmoothArc ( &$img, $cx, $cy, $w, $h, $color, $start, $stop) +{ + // Originally written from scratch by Ulrich Mierendorff, 06/2006 + // Rewritten and improved, 04/2007, 07/2007 + // compared to old version: + // + Support for transparency added + // + Improved quality of edges & antialiasing + + // note: This function does not represent the fastest way to draw elliptical + // arcs. It was written without reading any papers on that subject. Better + // algorithms may be twice as fast or even more. + + // what it cannot do: It does not support outlined arcs, only filled + + // Parameters: + // $cx - Center of ellipse, X-coord + // $cy - Center of ellipse, Y-coord + // $w - Width of ellipse ($w >= 2) + // $h - Height of ellipse ($h >= 2 ) + // $color - Color of ellipse as a four component array with RGBA + // $start - Starting angle of the arc, no limited range! + // $stop - Stop angle of the arc, no limited range! + // $start _can_ be greater than $stop! + // If any value is not in the given range, results are undefined! + + // This script does not use any special algorithms, everything is completely + // written from scratch; see http://de.wikipedia.org/wiki/Ellipse for formulas. + + while ($start < 0) + $start += 2*M_PI; + while ($stop < 0) + $stop += 2*M_PI; + + while ($start > 2*M_PI) + $start -= 2*M_PI; + + while ($stop > 2*M_PI) + $stop -= 2*M_PI; + + + if ($start > $stop) + { + imageSmoothArc ( $img, $cx, $cy, $w, $h, $color, $start, 2*M_PI); + imageSmoothArc ( $img, $cx, $cy, $w, $h, $color, 0, $stop); + return; + } + + $a = 1.0*round ($w/2); + $b = 1.0*round ($h/2); + $cx = 1.0*round ($cx); + $cy = 1.0*round ($cy); + + $aaAngle = atan(($b*$b)/($a*$a)*tan(0.25*M_PI)); + $aaAngleX = $a*cos($aaAngle); + $aaAngleY = $b*sin($aaAngle); + + $a -= 0.5; // looks better... + $b -= 0.5; + + for ($i=0; $i<4;$i++) + { + if ($start < ($i+1)*M_PI/2) + { + if ($start > $i*M_PI/2) + { + if ($stop > ($i+1)*M_PI/2) + { + imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY , $color, $start, ($i+1)*M_PI/2, $i); + } + else + { + imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY, $color, $start, $stop, $i); + break; + } + } + else + { + if ($stop > ($i+1)*M_PI/2) + { + imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY, $color, $i*M_PI/2, ($i+1)*M_PI/2, $i); + } + else + { + imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY, $color, $i*M_PI/2, $stop, $i); + break; + } + } + } + } +} +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_balls.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_balls.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_balls.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_balls.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-03-20 // Ver: $Id: imgdata_balls.inc.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== class ImgData_Balls extends ImgData { @@ -1058,4 +1058,4 @@ } } -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_bevels.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_bevels.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_bevels.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_bevels.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-03-20 // Ver: $Id: imgdata_bevels.inc.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== class ImgData_Bevels extends ImgData { @@ -101,4 +101,4 @@ } -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_diamonds.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_diamonds.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_diamonds.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_diamonds.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-03-20 // Ver: $Id: imgdata_diamonds.inc.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== class ImgData_Diamonds extends ImgData { @@ -174,4 +174,4 @@ } } -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_pushpins.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_pushpins.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_pushpins.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_pushpins.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-03-20 // Ver: $Id: imgdata_pushpins.inc.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== class ImgData_PushPins extends ImgData { @@ -514,4 +514,4 @@ } } -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_squares.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_squares.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_squares.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_squares.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-03-20 // Ver: $Id: imgdata_squares.inc.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== class ImgData_Squares extends ImgData { @@ -147,4 +147,4 @@ } } -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_stars.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_stars.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/imgdata_stars.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/imgdata_stars.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-03-20 // Ver: $Id: imgdata_stars.inc.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== @@ -141,4 +141,4 @@ } } -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpg-config.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpg-config.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpg-config.inc.php 2020-11-17 14:55:56.010477162 +0000 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpg-config.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2004-03-27 // Ver: $Id: jpg-config.inc.php 1871 2009-09-29 05:56:39Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== @@ -36,10 +36,8 @@ // //------------------------------------------------------------------------ // define('CACHE_DIR','/tmp/jpgraph_cache/'); -// define('TTF_DIR','/usr/share/fonts/truetype/'); -// define('MBTTF_DIR','/usr/share/fonts/truetype/'); -define('TTF_DIR','/usr/local/unjunkmgr/msttcorefonts/'); -define('MBTTF_DIR','/usr/local/unjunkmgr/msttcorefonts/'); +// define('TTF_DIR','/usr/share/fonts/TrueType/'); +// define('MBTTF_DIR','/usr/share/fonts/TrueType/'); //------------------------------------------------------------------------- // Cache directory specification for use with CSIM graphs that are @@ -131,4 +129,10 @@ // (Set to '' will give the default persmissions for the 'PHP-user') define('CACHE_FILE_MOD',0664); +// Default theme class name +define('DEFAULT_THEME_CLASS', 'UniversalTheme'); + +define('SUPERSAMPLING', true); +define('SUPERSAMPLING_SCALE', 1); + ?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_antispam-digits.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_antispam-digits.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_antispam-digits.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_antispam-digits.php 2020-05-26 05:18:30.000000000 +0100 @@ -3,9 +3,9 @@ // File: JPGRAPH_ANTISPAM.PHP // Description: Genarate anti-spam challenge // Created: 2004-10-07 -// Ver: $Id: jpgraph_antispam-digits.php 1106 2009-02-22 20:16:35Z ljp $ +// Ver: $Id: jpgraph_antispam-digits.php 1930 2010-01-22 20:19:27Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== class HandDigits { @@ -154,7 +154,7 @@ class AntiSpam { - var $iNumber=''; + private $iNumber=''; function __construct($aNumber='') { $this->iNumber = $aNumber; diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_antispam.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_antispam.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_antispam.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_antispam.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2004-10-07 // Ver: $Id: jpgraph_antispam.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== class HandDigits { diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_bar.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_bar.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_bar.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_bar.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2001-01-08 // Ver: $Id: jpgraph_bar.php 1905 2009-10-06 18:00:21Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -41,6 +41,8 @@ protected $bar_shadow=false; protected $bar_shadow_color="black"; protected $bar_shadow_hsize=3,$bar_shadow_vsize=3; + protected $bar_3d=false; + protected $bar_3d_hsize=3,$bar_3d_vsize=3; //--------------- // CONSTRUCTOR @@ -63,6 +65,14 @@ $this->value->margin += $aVSize; } + function Set3D($aHSize=3,$aVSize=3,$aShow=true) { + $this->bar_3d=$aShow; + $this->bar_3d_vsize=$aVSize; + $this->bar_3d_hsize=$aHSize; + + $this->value->margin += $aVSize; + } + // DEPRECATED use SetYBase instead function SetYMin($aYStartValue) { //die("JpGraph Error: Deprecated function SetYMin. Use SetYBase() instead."); @@ -299,6 +309,17 @@ } } + + /** + * @override + * Without overriding this method, $this->numpoints does not updated correctly. + */ + function Clear() { + $this->isRunningClear = true; + $this->__construct($this->inputValues['aDatay'], $this->inputValues['aDatax']); + $this->isRunningClear = false; + } + function Stroke($img,$xscale,$yscale) { $numpoints = count($this->coords[0]); @@ -420,6 +441,7 @@ $img->PopColor(); } +/////////////////////////kokorahen rectangle polygon////////////////////// // Remember value of this bar $val=$this->coords[0][$i]; @@ -463,6 +485,47 @@ } $img->FilledPolygon($sp); $img->PopColor(); + + } elseif( $this->bar_3d && $val != 0) { + // Determine the 3D + + $ssh = $this->bar_3d_hsize; + $ssv = $this->bar_3d_vsize; + + // Create points to create a "upper-right" shadow + if( $val > 0 ) { + $sp1[0]=$pts[6]; $sp1[1]=$pts[7]; + $sp1[2]=$pts[4]; $sp1[3]=$pts[5]; + $sp1[4]=$pts[4]+$ssh; $sp1[5]=$pts[5]-$ssv; + $sp1[6]=$pts[6]+$ssh; $sp1[7]=$pts[7]-$ssv; + + $sp2[0]=$pts[4]; $sp2[1]=$pts[5]; + $sp2[2]=$pts[2]; $sp2[3]=$pts[3]; + $sp2[4]=$pts[2]+$ssh; $sp2[5]=$pts[3]-$ssv; + $sp2[6]=$pts[4]+$ssh; $sp2[7]=$pts[5]-$ssv; + + } + elseif( $val < 0 ) { + $sp1[0]=$pts[4]; $sp1[1]=$pts[5]; + $sp1[2]=$pts[6]; $sp1[3]=$pts[7]; + $sp1[4]=$pts[6]+$ssh; $sp1[5]=$pts[7]-$ssv; + $sp1[6]=$pts[4]+$ssh; $sp1[7]=$pts[5]-$ssv; + + $sp2[0]=$pts[6]; $sp2[1]=$pts[7]; + $sp2[2]=$pts[0]; $sp2[3]=$pts[1]; + $sp2[4]=$pts[0]+$ssh; $sp2[5]=$pts[1]-$ssv; + $sp2[6]=$pts[6]+$ssh; $sp2[7]=$pts[7]-$ssv; + } + + $base_color = $this->fill_color; + + $img->PushColor($base_color . ':0.7'); + $img->FilledPolygon($sp1); + $img->PopColor(); + + $img->PushColor($base_color . ':1.1'); + $img->FilledPolygon($sp2); + $img->PopColor(); } // Stroke the pattern @@ -625,10 +688,11 @@ // Description: Produce grouped bar plots //=================================================== class GroupBarPlot extends BarPlot { - private $plots, $nbrplots=0; + public $plots; + private $nbrplots=0; //--------------- // CONSTRUCTOR - function GroupBarPlot($plots) { + function __construct($plots) { $this->width=0.7; $this->plots = $plots; $this->nbrplots = count($plots); @@ -663,7 +727,7 @@ $n = count($this->plots); for($i=0; $i < $n; ++$i) { list($xm,$ym) = $this->plots[$i]->Min(); - $xmin = max($xmin,$xm); + $xmin = min($xmin,$xm); $ymin = min($ymin,$ym); } return array($xmin,$ymin); @@ -716,7 +780,8 @@ // Description: Produce accumulated bar plots //=================================================== class AccBarPlot extends BarPlot { - private $plots=null,$nbrplots=0; + public $plots=null; + private $nbrplots=0; //--------------- // CONSTRUCTOR function __construct($plots) { @@ -1057,14 +1122,13 @@ // First stroke the accumulated value for the entire bar // This value is always placed at the top/bottom of the bars - if( $accy_neg < 0 ) { + if( $accy + $accy_neg < 0 ) { $y=$yscale->Translate($accy_neg); - $this->value->Stroke($img,$accy_neg,$x,$y); } else { $y=$yscale->Translate($accy); - $this->value->Stroke($img,$accy,$x,$y); } + $this->value->Stroke($img,$accy + $accy_neg,$x,$y); $accy = 0; $accy_neg = 0; @@ -1124,7 +1188,7 @@ $this->plots[$j]->value->SetMargin(-1); } } - $this->plots[$j]->value->Stroke($img,$this->plots[$j]->coords[0][$i],$x,$y); + $this->plots[$j]->value->Stroke($img,$this->plots[$j]->coords[0][$i],round($x),round($y)); } } diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_canvas.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_canvas.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_canvas.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_canvas.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2001-01-08 // Ver: $Id: jpgraph_canvas.php 1923 2010-01-11 13:48:49Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -92,4 +92,4 @@ } // Class /* EOF */ -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_canvtools.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_canvtools.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_canvtools.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_canvtools.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2002-08-23 // Ver: $Id: jpgraph_canvtools.php 1857 2009-09-28 14:38:14Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -520,4 +520,4 @@ } -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_contour.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_contour.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_contour.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_contour.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2009-03-08 // Ver: $Id: jpgraph_contour.php 1870 2009-09-29 04:24:18Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ require_once('jpgraph_meshinterpolate.inc.php'); diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_date.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_date.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_date.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_date.php 2020-10-16 02:47:52.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2005-05-02 // Ver: $Id: jpgraph_date.php 1106 2009-02-22 20:16:35Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -406,10 +406,16 @@ // identical to LinearScale::AutoScale if( $aStartTime == $aEndTime ) { // Special case when we only have one data point. - // Create a small artifical intervall to do the autoscaling + // Create a small artificial interval to do the autoscaling $aStartTime -= 10; $aEndTime += 10; } + if( abs($aEndTime - $aStartTime) <= 1 ) { + // Special case when we only have one second. + // Create a small artificial interval to do the autoscaling + $aStartTime -= 1; + $aEndTime += 1; + } $done=false; $i=0; while( ! $done && $i < 5) { diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_errhandler.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_errhandler.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_errhandler.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_errhandler.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -155,7 +155,7 @@ } $errobj->Raise($this->getMessage()); } - static public function defaultHandler(Exception $exception) { + static public function defaultHandler(Throwable $exception) { global $__jpg_OldHandler; if( $exception instanceof JpGraphException ) { $exception->Stroke(); @@ -347,6 +347,7 @@ $img->SetColor("black"); $img->SetFont(FF_FONT1,FS_NORMAL); $txt = new Text($aMsg,52,25); + $txt->SetFont(FF_FONT1); $txt->Align("left","top"); $txt->Stroke($img); if ($this->iDest) { diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_error.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_error.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_error.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_error.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2001-01-08 // Ver: $Id: jpgraph_error.php 1106 2009-02-22 20:16:35Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -154,4 +154,4 @@ /* EOF */ -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_flags.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_flags.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_flags.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_flags.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-06-28 // Ver: $Id: jpgraph_flags.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== //------------------------------------------------------------ @@ -267,7 +267,7 @@ private $iFlagData ; private $iOrdIdx=array(); - function FlagImages($aSize=FLAGSIZE1) { + function __construct($aSize=FLAGSIZE1) { switch($aSize) { case FLAGSIZE1 : case FLAGSIZE2 : @@ -309,10 +309,9 @@ $aOrd--; $n = count($this->iOrdIdx); if( $n == 0 ) { - reset($this->iCountryNameMap); $this->iOrdIdx=array(); $i=0; - while( list($key,$val) = each($this->iCountryNameMap) ) { + foreach( $this->iCountryNameMap as $key => $val ) { $this->iOrdIdx[$i++] = array($val,$key); } $tmp=$this->iOrdIdx[$aOrd]; @@ -341,18 +340,16 @@ $found=false; $aName = strtolower($aName); $nlen = strlen($aName); - reset($this->iCountryNameMap); // Start by trying to match exact index name - while( list($key,$val) = each($this->iCountryNameMap) ) { + foreach( $this->iCountryNameMap as $key => $val ) { if( $nlen == strlen($val) && $val == $aName ) { $found=true; break; } } if( !$found ) { - reset($this->iCountryNameMap); // If the exact index doesn't work try a (partial) full name - while( list($key,$val) = each($this->iCountryNameMap) ) { + foreach( $this->iCountryNameMap as $key => $val ) { if( strpos(strtolower($key), $aName) !== false ) { $found=true; break; @@ -373,4 +370,4 @@ -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_gantt.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_gantt.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_gantt.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_gantt.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2001-11-12 // Ver: $Id: jpgraph_gantt.php 1809 2009-09-09 13:07:33Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_gb2312.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_gb2312.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_gb2312.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_gb2312.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-05-30 // Ver: $Id: jpgraph_gb2312.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_gradient.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_gradient.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_gradient.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_gradient.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-02-01 // Ver: $Id: jpgraph_gradient.php 1761 2009-08-01 08:31:28Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -410,8 +410,8 @@ $bdelta=($to_color[2]-$from_color[2])/$numcols; $colorsperstep = $numcols/$arr_size; $prevcolnum = -1; - $from_alpha = $from_color[3]; - $to_alpha = $to_color[3]; + $from_alpha = floatval($from_color[3]); + $to_alpha = floatval($to_color[3]); $adelta = ( $to_alpha - $from_alpha ) / $numcols ; for ($i=0; $i < $arr_size; ++$i) { $colnum = floor($colorsperstep*$i); diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_iconplot.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_iconplot.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_iconplot.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_iconplot.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2004-02-18 // Ver: $Id: jpgraph_iconplot.php 1404 2009-06-28 15:25:41Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_imgtrans.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_imgtrans.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_imgtrans.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_imgtrans.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-09-06 // Ver: $Id: jpgraph_imgtrans.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== //------------------------------------------------------------------------ @@ -220,4 +220,4 @@ } -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_led.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_led.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_led.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_led.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2006-11-26 // Ver: $Id: jpgraph_led.php 1674 2009-07-22 19:42:23Z ljp $ // -// Copyright 2006 (c) Aditus Consulting. All rights reserved. +// Copyright 2006 (c) Asial Corporation. All rights reserved. // // Changed: 2007-08-06 by Alexander Kurochkin (inspector@list.ru) //======================================================================== diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_legend.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_legend.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_legend.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_legend.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -7,7 +7,7 @@ // Created: 2001-01-08 (Refactored to separate file 2008-08-01) // Ver: $Id: jpgraph_legend.inc.php 1926 2010-01-11 16:33:07Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== DEFINE('_DEFAULT_LPM_SIZE',8); // Default Legend Plot Mark size @@ -21,10 +21,10 @@ class Legend { public $txtcol=array(); - public $font_family=FF_FONT1,$font_style=FS_NORMAL,$font_size=12; - private $color=array(0,0,0); // Default fram color - private $fill_color=array(235,235,235); // Default fill color - private $shadow=true; // Shadow around legend "box" + public $font_family=FF_DEFAULT,$font_style=FS_NORMAL,$font_size=8; // old. 12 + private $color=array(120,120,120); // Default frame color + private $fill_color=array(245,245,245); // Default fill color + private $shadow=false; // Shadow around legend "box" private $shadow_color='darkgray'; private $mark_abs_hsize=_DEFAULT_LPM_SIZE,$mark_abs_vsize=_DEFAULT_LPM_SIZE; private $xmargin=10,$ymargin=0,$shadow_width=2; @@ -170,6 +170,10 @@ $this->bkg_gradto = $aTo; } + function HasItems() { + return (boolean)(count($this->txtcol)); + } + function Stroke($aImg) { // Constant $fillBoxFrameWeight=1; @@ -209,7 +213,7 @@ $rows++; $rowheight[$rows-1] = 0; } - $rowheight[$rows-1] = max($rowheight[$rows-1],$h); + $rowheight[$rows-1] = max($rowheight[$rows-1],$h)+1; } $abs_height = 0; @@ -364,6 +368,11 @@ $aImg->StyleLine($x1-$this->mark_abs_hsize,$marky,$x1+$this->mark_abs_hsize,$marky); } + // Stroke a mark using image + if( $p[2]->GetType() == MARK_IMG ) { + $p[2]->Stroke($aImg,$x1,$marky); + } + // Stroke a mark with the standard size // (As long as it is not an image mark ) if( $p[2]->GetType() != MARK_IMG ) { @@ -426,9 +435,10 @@ } else { $aImg->SetColor($p[1]); - $aImg->FilledRectangle($x1-$boxsize/2,$ym, - $x1+$boxsize/2,$ym+$boxsize); + $aImg->FilledRectangle($x1-$boxsize/2,$ym, $x1+$boxsize/2,$ym+$boxsize); } + + // Draw a plot frame line $aImg->SetColor($this->color); $aImg->SetLineWeight($fillBoxFrameWeight); $aImg->Rectangle($x1-$boxsize/2,$ym, diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_line.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_line.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_line.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_line.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2001-01-08 // Ver: $Id: jpgraph_line.php 1921 2009-12-11 11:46:39Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -35,7 +35,7 @@ //--------------- // CONSTRUCTOR - function LinePlot($datay,$datax=false) { + function __construct($datay,$datax=false) { parent::__construct($datay,$datax); $this->mark = new PlotMark() ; $this->color = ColorFactory::getColor(); diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_log.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_log.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_log.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_log.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2001-01-08 // Ver: $Id: jpgraph_log.php 1106 2009-02-22 20:16:35Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -131,7 +131,7 @@ private $ticklabels_pos = array(); //--------------- // CONSTRUCTOR - function LogTicks() { + function __construct() { } //--------------- // PUBLIC METHODS diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_meshinterpolate.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_meshinterpolate.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_meshinterpolate.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_meshinterpolate.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2009-03-09 // Ver: $Id: jpgraph_meshinterpolate.inc.php 1709 2009-07-30 08:00:08Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_mgraph.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_mgraph.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_mgraph.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_mgraph.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2006-01-15 // Ver: $Id: jpgraph_mgraph.php 1770 2009-08-17 06:10:22Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph.php 2020-11-11 01:57:45.000000000 +0000 @@ -5,7 +5,7 @@ // Created: 2001-01-08 // Ver: $Id: jpgraph.php 1924 2010-01-11 14:03:26Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== require_once('jpg-config.inc.php'); @@ -15,10 +15,11 @@ require_once('jpgraph_rgb.inc.php'); require_once('jpgraph_text.inc.php'); require_once('jpgraph_legend.inc.php'); +require_once('jpgraph_theme.inc.php'); require_once('gd_image.inc.php'); // Version info -define('JPG_VERSION','3.0.7'); +define('JPG_VERSION','4.3.4'); // Minimum required PHP version define('MIN_PHPVERSION','5.1.0'); @@ -160,6 +161,7 @@ define("_FORCE_IMGTOFILE",false); define("_FORCE_IMGDIR",'/tmp/jpgimg/'); + // // Automatic settings of path for cache and font directory // if they have not been previously specified @@ -229,13 +231,16 @@ list($majorC, $minorC, $editC) = preg_split('/[\/.-]/', PHP_VERSION); list($majorR, $minorR, $editR) = preg_split('/[\/.-]/', $aMinVersion); - if ($majorC != $majorR) return false; if ($majorC < $majorR) return false; - // same major - check minor - if ($minorC > $minorR) return true; - if ($minorC < $minorR) return false; - // and same minor - if ($editC >= $editR) return true; + + if ($majorC == $majorR) { + if($minorC < $minorR) return false; + + if($minorC == $minorR){ + if($editC < $editR) return false; + } + } + return true; } @@ -500,12 +505,12 @@ public $cache_name; // File name to be used for the current graph in the cache directory public $xgrid=null; // X Grid object (linear or logarithmic) public $ygrid=null,$y2grid=null; //dito for Y - public $doframe=true,$frame_color='black', $frame_weight=1; // Frame around graph + public $doframe,$frame_color, $frame_weight; // Frame around graph public $boxed=false, $box_color='black', $box_weight=1; // Box around plot area public $doshadow=false,$shadow_width=4,$shadow_color='gray@0.5'; // Shadow for graph public $xaxis=null; // X-axis (instane of Axis class) public $yaxis=null, $y2axis=null, $ynaxis=array(); // Y axis (instance of Axis class) - public $margin_color=array(230,230,230); // Margin color of graph + public $margin_color; // Margin color of graph public $plotarea_color=array(255,255,255); // Plot area color public $title,$subtitle,$subsubtitle; // Title and subtitle(s) text object public $axtype="linlin"; // Type of axis @@ -536,15 +541,15 @@ public $titlebackground = false; public $titlebackground_color = 'lightblue', $titlebackground_style = 1, - $titlebackground_framecolor = 'blue', - $titlebackground_framestyle = 2, - $titlebackground_frameweight = 1, - $titlebackground_bevelheight = 3 ; + $titlebackground_framecolor, + $titlebackground_framestyle, + $titlebackground_frameweight, + $titlebackground_bevelheight; public $titlebkg_fillstyle=TITLEBKG_FILLSTYLE_SOLID; public $titlebkg_scolor1='black',$titlebkg_scolor2='white'; - public $framebevel = false, $framebeveldepth = 2 ; - public $framebevelborder = false, $framebevelbordercolor='black'; - public $framebevelcolor1='white@0.4', $framebevelcolor2='black@0.4'; + public $framebevel, $framebeveldepth; + public $framebevelborder, $framebevelbordercolor; + public $framebevelcolor1, $framebevelcolor2; public $background_image_mix=100; public $background_cflag = ''; public $background_cflag_type = BGIMG_FILLPLOT; @@ -555,6 +560,7 @@ $iImgTransFillColor='white',$iImgTransHighQ=false, $iImgTransBorder=false,$iImgTransHorizonPos=0.5; public $legend; + public $graph_theme; protected $iYAxisDeltaPos=50; protected $iIconDepth=DEPTH_BACK; protected $iAxisLblBgType = 0, @@ -562,6 +568,10 @@ $iYAxisLblBgFillColor = 'lightgray', $iYAxisLblBgColor = 'black'; protected $iTables=NULL; + protected $isRunningClear = false; + protected $inputValues; + protected $isAfterSetScale = false; + // aWIdth Width in pixels of image // aHeight Height in pixels of image // aCachedName Name for image file in cache directory @@ -574,6 +584,9 @@ JpGraphError::RaiseL(25008);//('Image width/height argument in Graph::Graph() must be numeric'); } + // Initialize frame and margin + $this->InitializeFrameAndMargin(); + // Automatically generate the image file name based on the name of the script that // generates the graph if( $aCachedName == 'auto' ) { @@ -592,7 +605,7 @@ $this->title = new Text(); $this->title->ParagraphAlign('center'); - $this->title->SetFont(FF_FONT2,FS_BOLD); + $this->title->SetFont(FF_DEFAULT,FS_NORMAL); //FF_FONT2, FS_BOLD $this->title->SetMargin(5); $this->title->SetAlign('center'); @@ -620,6 +633,42 @@ $this->SetTickDensity(); // Normal density $this->tabtitle = new GraphTabTitle(); + + if (!$this->isRunningClear) { + $this->inputValues = array(); + $this->inputValues['aWidth'] = $aWidth; + $this->inputValues['aHeight'] = $aHeight; + $this->inputValues['aCachedName'] = $aCachedName; + $this->inputValues['aTimeout'] = $aTimeout; + $this->inputValues['aInline'] = $aInline; + + $theme_class = DEFAULT_THEME_CLASS; + if (class_exists($theme_class)) { + $this->graph_theme = new $theme_class(); + } + } + } + + function InitializeFrameAndMargin() { + $this->doframe=true; + $this->frame_color='black'; + $this->frame_weight=1; + + $this->titlebackground_framecolor = 'blue'; + $this->titlebackground_framestyle = 2; + $this->titlebackground_frameweight = 1; + $this->titlebackground_bevelheight = 3; + $this->titlebkg_fillstyle=TITLEBKG_FILLSTYLE_SOLID; + $this->titlebkg_scolor1='black'; + $this->titlebkg_scolor2='white'; + $this->framebevel = false; + $this->framebeveldepth = 2; + $this->framebevelborder = false; + $this->framebevelbordercolor='black'; + $this->framebevelcolor1='white@0.4'; + $this->framebevelcolor2='black@0.4'; + + $this->margin_color = array(250,250,250); } function SetupCache($aFilename,$aTimeout=60) { @@ -691,11 +740,6 @@ // Rotate the graph 90 degrees and set the margin // when we have done a 90 degree rotation function Set90AndMargin($lm=0,$rm=0,$tm=0,$bm=0) { - $lm = $lm ==0 ? floor(0.2 * $this->img->width) : $lm ; - $rm = $rm ==0 ? floor(0.1 * $this->img->width) : $rm ; - $tm = $tm ==0 ? floor(0.2 * $this->img->height) : $tm ; - $bm = $bm ==0 ? floor(0.1 * $this->img->height) : $bm ; - $adj = ($this->img->height - $this->img->width)/2; $this->img->SetMargin($tm-$adj,$bm-$adj,$rm+$adj,$lm+$adj); $this->img->SetCenter(floor($this->img->width/2),floor($this->img->height/2)); @@ -736,6 +780,10 @@ $this->plots[] = $aPlot; } } + + if ($this->graph_theme) { + $this->graph_theme->SetupPlot($aPlot); + } } function AddTable($aTable) { @@ -785,6 +833,10 @@ else { $this->y2plots[] = $aPlot; } + + if ($this->graph_theme) { + $this->graph_theme->SetupPlot($aPlot); + } } // Add plot to the extra Y-axises @@ -809,6 +861,10 @@ else { $this->ynplots[$aN][] = $aPlot; } + + if ($this->graph_theme) { + $this->graph_theme->SetupPlot($aPlot); + } } // Add text object to the graph @@ -1058,6 +1114,21 @@ $this->xgrid = new Grid($this->xaxis); $this->ygrid = new Grid($this->yaxis); $this->ygrid->Show(); + + + if (!$this->isRunningClear) { + $this->inputValues['aAxisType'] = $aAxisType; + $this->inputValues['aYMin'] = $aYMin; + $this->inputValues['aYMax'] = $aYMax; + $this->inputValues['aXMin'] = $aXMin; + $this->inputValues['aXMax'] = $aXMax; + + if ($this->graph_theme) { + $this->graph_theme->ApplyGraph($this); + } + } + + $this->isAfterSetScale = true; } // Specify secondary Y scale @@ -1084,6 +1155,10 @@ // Deafult position is the max x-value $this->y2grid = new Grid($this->y2axis); + + if ($this->graph_theme) { + $this->graph_theme->ApplyGraph($this); + } } // Set the delta position (in pixels) between the multiple Y-axis @@ -1111,6 +1186,10 @@ $this->ynaxis[$aN] = new Axis($this->img,$this->ynscale[$aN]); $this->ynaxis[$aN]->scale->ticks->SetDirection(SIDE_LEFT); $this->ynaxis[$aN]->SetLabelSide(SIDE_RIGHT); + + if ($this->graph_theme) { + $this->graph_theme->ApplyGraph($this); + } } // Specify density of ticks when autoscaling 'normal', 'dense', 'sparse', 'verysparse' @@ -1206,9 +1285,11 @@ } } - $n = count($this->iTables); - for( $i=0; $i < $n; ++$i ) { - $csim .= $this->iTables[$i]->GetCSIMareas(); + if($this->iTables != null) { + $n = count($this->iTables); + for ($i = 0; $i < $n; ++$i) { + $csim .= $this->iTables[$i]->GetCSIMareas(); + } } return $csim; @@ -1283,7 +1364,7 @@ // Now reconstruct any user URL argument reset($_GET); - while( list($key,$value) = each($_GET) ) { + foreach ($_GET as $key => $value) { if( is_array($value) ) { foreach ( $value as $k => $v ) { $urlarg .= '&'.$key.'%5B'.$k.'%5D='.urlencode($v); @@ -1298,7 +1379,7 @@ // but there is little else we can do. One idea for the // future might be recreate the POST header in case. reset($_POST); - while( list($key,$value) = each($_POST) ) { + foreach ($_POST as $key => $value) { if( is_array($value) ) { foreach ( $value as $k => $v ) { $urlarg .= '&'.$key.'%5B'.$k.'%5D='.urlencode($v); @@ -1408,7 +1489,7 @@ else { $txts = $this->texts; } - $n = count($txts); + $n = is_array($txts) ? count($txts) : 0; $min=null; $max=null; for( $i=0; $i < $n; ++$i ) { @@ -1437,7 +1518,7 @@ else { $txts = $this->texts; } - $n = count($txts); + $n = is_array($txts) ? count($txts) : 0; $min=null; $max=null; for( $i=0; $i < $n; ++$i ) { @@ -1488,8 +1569,10 @@ foreach( $this->y2plots as $p ) { list($xmin,$ymin) = $p->Min(); list($xmax,$ymax) = $p->Max(); - $min = Min($xmin,$min); - $max = Max($xmax,$max); + if( $xmin !== null && $xmax !== null ) { + $min = Min($xmin, $min); + $max = Max($xmax, $max); + } } } @@ -1499,8 +1582,10 @@ foreach( $this->ynplots[$i] as $p ) { list($xmin,$ymin) = $p->Min(); list($xmax,$ymax) = $p->Max(); - $min = Min($xmin,$min); - $max = Max($xmax,$max); + if( $xmin !== null && $xmax !== null ) { + $min = Min($xmin, $min); + $max = Max($xmax, $max); + } } } } @@ -1508,9 +1593,16 @@ } function AdjustMarginsForTitles() { - $totrequired = ($this->title->t != '' ? $this->title->GetTextHeight($this->img) + $this->title->margin + 5 : 0 ) + - ($this->subtitle->t != '' ? $this->subtitle->GetTextHeight($this->img) + $this->subtitle->margin + 5 : 0 ) + - ($this->subsubtitle->t != '' ? $this->subsubtitle->GetTextHeight($this->img) + $this->subsubtitle->margin + 5 : 0 ) ; + $totrequired = + ($this->title->t != '' + ? $this->title->GetTextHeight($this->img) + $this->title->margin + 5 * SUPERSAMPLING_SCALE + : 0 ) + + ($this->subtitle->t != '' + ? $this->subtitle->GetTextHeight($this->img) + $this->subtitle->margin + 5 * SUPERSAMPLING_SCALE + : 0 ) + + ($this->subsubtitle->t != '' + ? $this->subsubtitle->GetTextHeight($this->img) + $this->subsubtitle->margin + 5 * SUPERSAMPLING_SCALE + : 0 ) ; $btotrequired = 0; if($this->xaxis != null && !$this->xaxis->hide && !$this->xaxis->hide_labels ) { @@ -1545,13 +1637,24 @@ // DO Nothing. It gets too messy to do this properly for 90 deg... } else{ + // need more top margin if( $this->img->top_margin < $totrequired ) { - $this->SetMargin($this->img->left_margin,$this->img->right_margin, - $totrequired,$this->img->bottom_margin); + $this->SetMargin( + $this->img->raw_left_margin, + $this->img->raw_right_margin, + $totrequired / SUPERSAMPLING_SCALE, + $this->img->raw_bottom_margin + ); } + + // need more bottom margin if( $this->img->bottom_margin < $btotrequired ) { - $this->SetMargin($this->img->left_margin,$this->img->right_margin, - $this->img->top_margin,$btotrequired); + $this->SetMargin( + $this->img->raw_left_margin, + $this->img->raw_right_margin, + $this->img->raw_top_margin, + $btotrequired / SUPERSAMPLING_SCALE + ); } } } @@ -1907,7 +2010,6 @@ // $aStrokeFileName If != "" the image will be written to this file and NOT // streamed back to the browser function Stroke($aStrokeFileName='') { - // Fist make a sanity check that user has specified a scale if( empty($this->yscale) ) { JpGraphError::RaiseL(25031);//('You must specify what scale to use with a call to Graph::SetScale().'); @@ -1951,6 +2053,10 @@ // Setup pre-stroked adjustments and Legends $this->doPrestrokeAdjustments(); + if ($this->graph_theme) { + $this->graph_theme->PreStrokeApply($this); + } + // Bail out if any of the Y-axis not been specified and // has no plots. (This means it is impossible to do autoscaling and // no other scale was given so we can't possible draw anything). If you use manual @@ -2597,7 +2703,7 @@ } $this->img->SetColor($this->margin_color); - // $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->height-1-$vadj); + $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->height-1-$vadj); $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->top_margin); $this->img->FilledRectangle(0,$this->img->top_margin,$this->img->left_margin,$this->img->height-1-$hadj); @@ -2638,7 +2744,7 @@ $aa = $this->img->SetAngle(0); $this->StrokeFrame(); $aa = $this->img->SetAngle($aa); - $this->StrokeBackgroundGrad(); + $this->StrokeBackgroundGrad(); if( $this->bkg_gradtype < 0 || ($this->bkg_gradtype > 0 && $this->bkg_gradstyle==BGRAD_MARGIN) ) { $this->FillPlotArea(); } @@ -2916,7 +3022,7 @@ // Get Y min and max values for added lines function GetLinesYMinMax( $aLines ) { - $n = count($aLines); + $n = is_array($aLines) ? count($aLines) : 0; if( $n == 0 ) return false; $min = $aLines[0]->scaleposition ; $max = $min ; @@ -2934,7 +3040,7 @@ // Get X min and max values for added lines function GetLinesXMinMax( $aLines ) { - $n = count($aLines); + $n = is_array($aLines) ? count($aLines) : 0; if( $n == 0 ) return false ; $min = $aLines[0]->scaleposition ; $max = $min ; @@ -2982,6 +3088,79 @@ return array($min,$max); } + function hasLinePlotAndBarPlot() { + $has_line = false; + $has_bar = false; + + foreach ($this->plots as $plot) { + if ($plot instanceof LinePlot) { + $has_line = true; + } + if ($plot instanceof BarPlot) { + $has_bar = true; + } + } + + if ($has_line && $has_bar) { + return true; + } + + return false; + } + + function SetTheme($graph_theme) { + + if (!($this instanceof PieGraph)) { + if (!$this->isAfterSetScale) { + JpGraphError::RaiseL(25133);//('Use Graph::SetTheme() after Graph::SetScale().'); + } + } + + if ($this->graph_theme) { + $this->ClearTheme(); + } + $this->graph_theme = $graph_theme; + $this->graph_theme->ApplyGraph($this); + } + + function ClearTheme() { + $this->graph_theme = null; + + $this->isRunningClear = true; + + $this->__construct( + $this->inputValues['aWidth'], + $this->inputValues['aHeight'], + $this->inputValues['aCachedName'], + $this->inputValues['aTimeout'], + $this->inputValues['aInline'] + ); + + if (!($this instanceof PieGraph)) { + if ($this->isAfterSetScale) { + $this->SetScale( + $this->inputValues['aAxisType'], + $this->inputValues['aYMin'], + $this->inputValues['aYMax'], + $this->inputValues['aXMin'], + $this->inputValues['aXMax'] + ); + } + } + + $this->isRunningClear = false; + } + + function SetSupersampling($do = false, $scale = 2) { + if ($do) { + define('SUPERSAMPLING_SCALE', $scale); + // $this->img->scale = $scale; + } else { + define('SUPERSAMPLING_SCALE', 1); + //$this->img->scale = 0; + } + } + } // Class //=================================================== @@ -2989,7 +3168,7 @@ // Description: Holds properties for a line //=================================================== class LineProperty { - public $iWeight=1, $iColor='black', $iStyle='solid', $iShow=true; + public $iWeight=1, $iColor='black', $iStyle='solid', $iShow=false; function __construct($aWeight=1,$aColor='black',$aStyle='solid') { $this->iWeight = $aWeight; @@ -3342,7 +3521,7 @@ class Grid { protected $img; protected $scale; - protected $majorcolor='#DDDDDD',$minorcolor='#EEEEEE'; + protected $majorcolor='#CCCCCC',$minorcolor='#DDDDDD'; protected $majortype='solid',$minortype='solid'; protected $show=false, $showMinor=false,$majorweight=1,$minorweight=1; protected $fill=false,$fillcolor=array('#EFEFEF','#BBCCFF'); @@ -3410,7 +3589,7 @@ if( $this->fill ) { // Draw filled areas - $y2 = $aTicksPos[0]; + $y2 = !empty($aTicksPos) ? $aTicksPos[0] : null; $i=1; while( $i < $nbrgrids ) { $y1 = $y2; @@ -3435,7 +3614,7 @@ for($i=0; $i < $nbrgrids; ++$i) { $y=$aTicksPos[$i]; - $this->img->StyleLine($xl,$y,$xr,$y,$style); + $this->img->StyleLine($xl,$y,$xr,$y,$style,true); } } elseif( $this->scale->type == 'x' ) { @@ -3463,12 +3642,11 @@ // assumption offset==0 so we might end up drawing one // to many gridlines $i=0; - $x=$aTicksPos[$i]; while( $iimg->Line($x,$yl,$x,$yu); - elseif( $aType == 'dotted' ) $this->img->DashedLine($x,$yl,$x,$yu,1,6); - elseif( $aType == 'dashed' ) $this->img->DashedLine($x,$yl,$x,$yu,2,4); - elseif( $aType == 'longdashed' ) $this->img->DashedLine($x,$yl,$x,$yu,8,6); + elseif( $aType == 'dotted' ) $this->img->DashedLineForGrid($x,$yl,$x,$yu,1,6); + elseif( $aType == 'dashed' ) $this->img->DashedLineForGrid($x,$yl,$x,$yu,2,4); + elseif( $aType == 'longdashed' ) $this->img->DashedLineForGrid($x,$yl,$x,$yu,8,6); ++$i; } } @@ -3492,7 +3670,7 @@ public $img=null; public $hide=false,$hide_labels=false; public $title=null; - public $font_family=FF_FONT1,$font_style=FS_NORMAL,$font_size=12,$label_angle=0; + public $font_family=FF_DEFAULT,$font_style=FS_NORMAL,$font_size=8,$label_angle=0; public $tick_step=1; public $pos = false; public $ticks_label = array(); @@ -3732,13 +3910,21 @@ $pos=$aOtherAxisScale->Translate(0); } } + $pos += $this->iDeltaAbsPos; $this->img->SetLineWeight($this->weight); $this->img->SetColor($this->color); $this->img->SetFont($this->font_family,$this->font_style,$this->font_size); + if( $this->scale->type == "x" ) { if( !$this->hide_line ) { - $this->img->FilledRectangle($this->img->left_margin,$pos,$this->img->width-$this->img->right_margin,$pos+$this->weight-1); + // Stroke X-axis + $this->img->FilledRectangle( + $this->img->left_margin, + $pos, + $this->img->width - $this->img->right_margin, + $pos + $this->weight-1 + ); } if( $this->title_side == SIDE_DOWN ) { $y = $pos + $this->img->GetFontHeight() + $this->title_margin + $this->title->margin; @@ -3766,8 +3952,15 @@ // Add line weight to the height of the axis since // the x-axis could have a width>1 and we want the axis to fit nicely together. if( !$this->hide_line ) { - $this->img->FilledRectangle($pos-$this->weight+1,$this->img->top_margin,$pos,$this->img->height-$this->img->bottom_margin+$this->weight-1); + // Stroke Y-axis + $this->img->FilledRectangle( + $pos - $this->weight + 1, + $this->img->top_margin, + $pos, + $this->img->height - $this->img->bottom_margin + $this->weight - 1 + ); } + $x=$pos ; if( $this->title_side == SIDE_LEFT ) { $x -= $this->title_margin; @@ -4142,14 +4335,14 @@ } function HaveManualLabels() { - return count($this->iManualTickLabels) > 0; + return is_array($this->iManualTickLabels) ? count($this->iManualTickLabels) > 0 : false; } // Specify all the tick positions manually and possible also the exact labels function _doManualTickPos($aScale) { $n=count($this->iManualTickPos); - $m=count($this->iManualMinTickPos); - $doLbl=count($this->iManualTickLabels) > 0; + $m= is_array($this->iManualMinTickPos) ? count($this->iManualMinTickPos) : 0; + $doLbl= is_array($this->iManualTickLabels) ? count($this->iManualTickLabels) > 0 : false; $this->maj_ticks_pos = array(); $this->maj_ticklabels_pos = array(); @@ -4259,7 +4452,11 @@ } } elseif( $aScale->type == "y" ) { + //@todo s=2:20,12 s=1:50,6 $this->major_step:$nbr + // abs_point,limit s=1:270,80 s=2:540,160 + // $this->major_step = 50; $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal())/$this->major_step)+1; +// $step = 5; while( round($abs_pos) >= $limit ) { $this->ticks_pos[$i] = round($abs_pos); $this->ticks_label[$i]=$label; @@ -4287,7 +4484,7 @@ // If precision hasn't been specified set it to a sensible value if( $this->precision==-1 ) { $t = log10($this->minor_step); - if( $t > 0 ) { + if( $t > 0 || $t === 0.0) { $precision = 0; } else { @@ -4475,12 +4672,13 @@ public $name = 'lin'; 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) - public $world_size; // Plot area size in world coordinates public $intscale=false; // Restrict autoscale to integers protected $autoscale_min=false; // Forced minimum value, auto determine max protected $autoscale_max=false; // Forced maximum value, auto determine min private $gracetop=0,$gracebottom=0; + private $_world_size; // Plot area size in world coordinates + function __construct($aMin=0,$aMax=0,$aType='y') { assert($aType=='x' || $aType=='y' ); assert($aMin<=$aMax); @@ -4811,7 +5009,7 @@ $this->off=$img->left_margin; $this->scale_factor = 0; if( $this->world_size > 0 ) { - $this->scale_factor=$this->world_abs_size/($this->world_size*1.0); + $this->scale_factor=$this->world_abs_size/($this->world_size*0.999999); } } else { // y scale @@ -4819,7 +5017,7 @@ $this->off=$img->top_margin+$this->world_abs_size; $this->scale_factor = 0; if( $this->world_size > 0 ) { - $this->scale_factor=-$this->world_abs_size/($this->world_size*1.0); + $this->scale_factor=-$this->world_abs_size/($this->world_size*0.999999); } } $size = $this->world_size * $this->scale_factor; @@ -4839,7 +5037,7 @@ if( $this->world_size<=0 ) { // This should never ever happen !! JpGraphError::RaiseL(25074); - //("You have unfortunately stumbled upon a bug in JpGraph. It seems like the scale range is ".$this->world_size." [for ".$this->type." scale]
Please report Bug #01 to jpgraph@aditus.nu and include the script that gave this error. This problem could potentially be caused by trying to use \"illegal\" values in the input data arrays (like trying to send in strings or only NULL values) which causes the autoscaling to fail."); + //("You have unfortunately stumbled upon a bug in JpGraph. It seems like the scale range is ".$this->world_size." [for ".$this->type." scale]
Please report Bug #01 to info@jpgraph.net and include the script that gave this error. This problem could potentially be caused by trying to use \"illegal\" values in the input data arrays (like trying to send in strings or only NULL values) which causes the autoscaling to fail."); } // scale_factor = number of pixels per world unit @@ -5018,6 +5216,20 @@ } return 3; // $c smallest } + + function __get($name) { + $variable_name = '_' . $name; + + if (isset($this->$variable_name)) { + return $this->$variable_name * SUPERSAMPLING_SCALE; + } else { + JpGraphError::RaiseL('25132', $name); + } + } + + function __set($name, $value) { + $this->{'_'.$name} = $value; + } } // Class @@ -5030,7 +5242,7 @@ public $show=false; public $valign='',$halign='center'; public $format='%.1f',$negformat=''; - private $ff=FF_FONT1,$fs=FS_NORMAL,$fsize=10; + private $ff=FF_DEFAULT,$fs=FS_NORMAL,$fsize=8; private $iFormCallback=''; private $angle=0; private $color='navy',$negcolor=''; @@ -5050,7 +5262,7 @@ $this->negcolor = $aNegcolor; } - function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) { + function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=8) { $this->ff=$aFontFamily; $this->fs=$aFontStyle; $this->fsize=$aFontSize; @@ -5175,11 +5387,21 @@ protected $weight=1; protected $center=false; + protected $inputValues; + protected $isRunningClear = false; + function __construct($aDatay,$aDatax=false) { $this->numpoints = count($aDatay); if( $this->numpoints==0 ) { JpGraphError::RaiseL(25121);//("Empty input data array specified for plot. Must have at least one data point."); } + + if (!$this->isRunningClear) { + $this->inputValues = array(); + $this->inputValues['aDatay'] = $aDatay; + $this->inputValues['aDatax'] = $aDatax; + } + $this->coords[0]=$aDatay; if( is_array($aDatax) ) { $this->coords[1]=$aDatax; @@ -5345,6 +5567,12 @@ } } + function Clear() { + $this->isRunningClear = true; + Plot::__construct($this->inputValues['aDatay'], $this->inputValues['aDatax']); + $this->isRunningClear = false; + } + } // Class diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_pie3d.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_pie3d.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_pie3d.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_pie3d.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2001-03-24 // Ver: $Id: jpgraph_pie3d.php 1329 2009-06-20 19:23:30Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_pie.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_pie.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_pie.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_pie.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2001-02-14 // Ver: $Id: jpgraph_pie.php 1926 2010-01-11 16:33:07Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -23,6 +23,9 @@ //=================================================== class PiePlot { public $posx=0.5,$posy=0.5; + public $is_using_plot_theme = false; + public $theme="earth"; + protected $use_plot_theme_colors = false; protected $radius=0.3; protected $explode_radius=array(),$explode_all=false,$explode_r=20; protected $labels=null, $legends=null; @@ -39,7 +42,6 @@ "pastel" => array(27,415,128,59,66,79,105,110,42,147,152,230,236,240,331,337,405,38), "water" => array(8,370,24,40,335,56,213,237,268,14,326,387,10,388), "sand" => array(27,168,34,170,19,50,65,72,131,209,46,393)); - protected $theme="earth"; protected $setslicecolors=array(); protected $labeltype=0; // Default to percentage protected $pie_border=true,$pie_interior_border=true; @@ -59,7 +61,7 @@ function __construct($data) { $this->data = array_reverse($data); $this->title = new Text(""); - $this->title->SetFont(FF_FONT1,FS_BOLD); + $this->title->SetFont(FF_DEFAULT,FS_BOLD); $this->value = new DisplayValue(); $this->value->Show(); $this->value->SetFormat('%.1f%%'); @@ -177,10 +179,15 @@ function SetTheme($aTheme) { - if( in_array($aTheme,array_keys($this->themearr)) ) - $this->theme = $aTheme; - else - JpGraphError::RaiseL(15001,$aTheme);//("PiePLot::SetTheme() Unknown theme: $aTheme"); +// JpGraphError::RaiseL(15012,$aTheme); +// return; + + if( in_array($aTheme,array_keys($this->themearr)) ) { + $this->theme = $aTheme; + $this->is_using_plot_theme = true; + } else { + JpGraphError::RaiseL(15001,$aTheme);//("PiePLot::SetTheme() Unknown theme: $aTheme"); + } } function ExplodeSlice($e,$radius=20) { @@ -289,14 +296,16 @@ // Make sure we don't plot more values than data points // (in case the user added more legends than data points) - $n = min(count($this->legends),count($this->data)); + $legendsCount = is_array($this->legends) ? count($this->legends) : 0; + $n = min($legendsCount,count($this->data)); if( $this->legends != "" ) { $this->legends = array_reverse(array_slice($this->legends,0,$n)); } for( $i=$n-1; $i >= 0; --$i ) { $l = $this->legends[$i]; // Replace possible format with actual values - if( count($this->csimalts) > $i ) { + $count = is_array($this->csimalts) ? count($this->csimalts) : 0; + if( $count > $i ) { $fmt = $this->csimalts[$i]; } else { @@ -325,10 +334,12 @@ } if( $this->setslicecolors==null ) { - $graph->legend->Add($l,$colors[$ta[$i%$numcolors]],"",0,$this->csimtargets[$i],$alt,$wintarg); + $csimtarget = isset($this->csimtargets[$i]) ? $this->csimtargets[$i] : null; + $graph->legend->Add($l,$colors[$ta[$i%$numcolors]],"",0,$csimtarget,$alt,$wintarg); } else { - $graph->legend->Add($l,$this->setslicecolors[$i%$numcolors],"",0,$this->csimtargets[$i],$alt,$wintarg); + $csimtarget = isset($this->csimtargets[$i]) ? $this->csimtargets[$i] : null; + $graph->legend->Add($l,$this->setslicecolors[$i%$numcolors],"",0,$csimtarget,$alt,$wintarg); } } } @@ -398,6 +409,10 @@ $this->adjusted_data = $this->AdjPercentage($this->data); } + if ($this->use_plot_theme_colors) { + $this->setslicecolors = null; + } + $colors = array_keys($img->rgb->rgb_table); sort($colors); $ta=$this->themearr[$this->theme]; @@ -1018,6 +1033,10 @@ $this->value->Stroke($img,$label,$xt-$dx*$w,$yt-$dy*$h); } } + + function UsePlotThemeColors($flag = true) { + $this->use_plot_theme_colors = $flag; + } } // Class @@ -1233,6 +1252,10 @@ $this->posx=$width/2; $this->posy=$height/2; $this->SetColor(array(255,255,255)); + + if ($this->graph_theme) { + $this->graph_theme->ApplyGraph($this); + } } //--------------- @@ -1252,13 +1275,26 @@ if( is_array($aObj) ) { $n = count($aObj); for($i=0; $i < $n; ++$i ) { + //if ($aObj[$i]->theme) { + // $this->ClearTheme(); + //} $this->plots[] = $aObj[$i]; } } else { + //if ($aObj->theme) { + // $this->ClearTheme(); + //} $this->plots[] = $aObj; } } + + if ($this->graph_theme) { + $this->graph_theme->SetupPlot($aObj); + if ($aObj->is_using_plot_theme) { + $aObj->UsePlotThemeColors(); + } + } } function SetAntiAliasing($aFlg=true) { @@ -1303,6 +1339,7 @@ // Method description function Stroke($aStrokeFileName="") { + // If the filename is the predefined value = '_csim_special_' // we assume that the call to stroke only needs to do enough // to correctly generate the CSIM maps. diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotband.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotband.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotband.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotband.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2004-02-18 // Ver: $Id: jpgraph_plotband.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== // Constants for types of static bands in plot area diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotline.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotline.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotline.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotline.php 2020-05-26 05:18:30.000000000 +0100 @@ -3,14 +3,14 @@ // File: JPGRAPH_PLOTLINE.PHP // Description: PlotLine extension for JpGraph // Created: 2009-03-24 - // Ver: $Id: jpgraph_plotline.php 1881 2009-10-01 10:28:12Z ljp $ + // Ver: $Id: jpgraph_plotline.php 1931 2010-03-22 15:05:48Z ljp $ // // CLASS PlotLine // Data container class to hold properties for a static // line that is drawn directly in the plot area. // Useful to add static borders inside a plot to show for example set-values // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -60,6 +60,10 @@ $this->iLineStyle = $aStyle; } + function GetCSIMAreas() { + return ''; + } + //--------------- // PRIVATE METHODS @@ -135,4 +139,4 @@ } -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotmark.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotmark.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotmark.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_plotmark.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-03-21 // Ver: $Id: jpgraph_plotmark.inc.php 1106 2009-02-22 20:16:35Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== @@ -501,4 +501,4 @@ } } -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_polar.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_polar.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_polar.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_polar.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-02-02 // Ver: $Id: jpgraph_polar.php 1796 2009-09-07 09:37:19Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -423,6 +423,7 @@ $this->img->Line($x1,$y1,$x2,$y2); } } + $a = (int) $a; $a += $this->angle_step; } } @@ -487,6 +488,7 @@ if( $this->show_angle_tick ) { $this->img->Line($x1,$y1,$x2,$y2); } + $a = (int) $a; $a += $this->angle_step; } } diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_radar.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_radar.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_radar.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_radar.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2001-02-04 // Ver: $Id: jpgraph_radar.php 1783 2009-08-25 11:41:01Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_regstat.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_regstat.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_regstat.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_regstat.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2002-12-01 // Ver: $Id: jpgraph_regstat.php 1131 2009-03-11 20:08:24Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_rgb.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_rgb.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_rgb.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_rgb.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -6,7 +6,7 @@ // Created: 2001-01-08 (Refactored to separate file 2008-08-01) // Ver: $Id: jpgraph_rgb.inc.php 1893 2009-10-02 23:15:25Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_scatter.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_scatter.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_scatter.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_scatter.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2001-02-11 // Ver: $Id: jpgraph_scatter.php 1397 2009-06-27 21:34:14Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ require_once ('jpgraph_plotmark.inc.php'); @@ -136,7 +136,7 @@ //--------------- // CONSTRUCTOR function __construct($datay,$datax=false) { - if( (count($datax) != count($datay)) && is_array($datax)) { + if( is_array($datax) && (count($datax) != count($datay)) ) { JpGraphError::RaiseL(20003);//("Scatterplot must have equal number of X and Y points."); } parent::__construct($datay,$datax); @@ -239,4 +239,4 @@ } } // Class /* EOF */ -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_stock.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_stock.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_stock.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_stock.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2003-01-27 // Ver: $Id: jpgraph_stock.php 1364 2009-06-24 07:07:44Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -195,4 +195,4 @@ } /* EOF */ -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_table.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_table.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_table.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_table.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,1331 @@ +iVal = new Text($aVal); + $this->iRow = $aRow; + $this->iCol = $aCol; + $this->iPRow = $aRow; // Initialiy each cell is its own parent + $this->iPCol = $aCol; + $this->iIconConstrain = array(-1,-1); + } + + function Init($aTable) { + $this->iTable = $aTable; + } + + function SetCSIMTarget($aTarget,$aAlt='',$aWinTarget='') { + $this->iCSIMtarget = $aTarget; + $this->iCSIMwintarget = $aWinTarget; + $this->iCSIMalt = $aAlt; + } + + function GetCSIMArea() { + if( $this->iCSIMtarget !== '' ) + return $this->iCSIMArea; + else + return ''; + } + + function SetImageConstrain($aType,$aVal) { + if( !in_array($aType,array(TIMG_WIDTH, TIMG_HEIGHT)) ) { + JpGraphError::RaiseL(27015); + } + $this->iIconConstrain = array($aType,$aVal); + } + + function SetCountryFlag($aFlag,$aScale=1.0,$aMix=100,$aStdSize=3) { + $this->iIcon = new IconPlot(); + $this->iIcon->SetCountryFlag($aFlag,0,0,$aScale,$aMix,$aStdSize); + } + + function SetImage($aFile,$aScale=1.0,$aMix=100) { + $this->iIcon = new IconPlot($aFile,0,0,$aScale,$aMix); + } + + function SetImageFromString($aStr,$aScale=1.0,$aMix=100) { + $this->iIcon = new IconPlot("",0,0,$aScale,$aMix); + $this->iIcon->CreateFromString($aStr); + } + + function SetRowColSpan($aRowSpan,$aColSpan) { + $this->iRowSpan = $aRowSpan; + $this->iColSpan = $aColSpan; + $this->iMerged = true; + } + + function SetMerged($aPRow,$aPCol,$aFlg=true) { + $this->iMerged = $aFlg; + $this->iPRow=$aPRow; + $this->iPCol=$aPCol; + } + + function IsMerged() { + return $this->iMerged; + } + + function SetNumberFormat($aF) { + $this->iNumberFormat = $aF; + } + + function Set($aTxt) { + $this->iVal->Set($aTxt); + } + + function SetFont($aFF,$aFS,$aFSize) { + $this->iFF = $aFF; + $this->iFS = $aFS; + $this->iFSize = $aFSize; + $this->iVal->SetFont($aFF,$aFS,$aFSize); + } + + function SetFillColor($aColor) { + $this->iBGColor=$aColor; + } + + function SetFontColor($aColor) { + $this->iFontColor=$aColor; + } + + function SetGridColor($aLeft,$aTop=null,$aBottom=null,$aRight=null) { + if( $aLeft !== null ) $this->iGridColor[0] = $aLeft; + if( $aTop !== null ) $this->iGridColor[1] = $aTop; + if( $aBottom !== null ) $this->iGridColor[2] = $aBottom; + if( $aRight !== null )$this->iGridColor[3] = $aRight; + } + + function SetGridStyle($aLeft,$aTop=null,$aBottom=null,$aRight=null) { + if( $aLeft !== null ) $this->iGridStyle[0] = $aLeft; + if( $aTop !== null ) $this->iGridStyle[1] = $aTop; + if( $aBottom !== null ) $this->iGridStyle[2] = $aBottom; + if( $aRight !== null )$this->iGridStyle[3] = $aRight; + } + + function SetGridWeight($aLeft=null,$aTop=null,$aBottom=null,$aRight=null) { + $weight_arr = array($aLeft, $aTop, $aBottom, $aRight); + for ($i = 0; $i < count($weight_arr); $i++) { + if ($weight_arr[$i] === "") { + $weight_arr[$i] = 0; + } + } + if( $aLeft !== null ) $this->iGridWeight[0] = $weight_arr[0]; + if( $aTop !== null ) $this->iGridWeight[1] = $weight_arr[1]; + if( $aBottom !== null ) $this->iGridWeight[2] = $weight_arr[2]; + if( $aRight !== null ) $this->iGridWeight[3] = $weight_arr[3]; + } + + function SetMargin($aLeft,$aRight,$aTop,$aBottom) { + $this->iMarginLeft=$aLeft; + $this->iMarginRight=$aRight; + $this->iMarginTop=$aTop; + $this->iMarginBottom=$aBottom; + } + + function GetWidth($aImg) { + if( $this->iIcon !== null ) { + if( $this->iIconConstrain[0] == TIMG_WIDTH ) { + $this->iIcon->SetScale(1); + $tmp = $this->iIcon->GetWidthHeight(); + $this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[0]); + } + elseif( $this->iIconConstrain[0] == TIMG_HEIGHT ) { + $this->iIcon->SetScale(1); + $tmp = $this->iIcon->GetWidthHeight(); + $this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[1]); + } + $tmp = $this->iIcon->GetWidthHeight(); + $iwidth = $tmp[0]; + } + else { + $iwidth=0; + } + if( $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->dir == 0 ) { + $pwidth = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetWidth($aImg); + } + elseif( $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->dir == 90 ) { + $pwidth = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetFontHeight($aImg)+2; + } + else { + $pwidth = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetWidth($aImg)+2; + } + + $pcolspan = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iColSpan; + return round(max($iwidth,$pwidth)/$pcolspan) + $this->iMarginLeft + $this->iMarginRight; + } + + function GetHeight($aImg) { + if( $this->iIcon !== null ) { + if( $this->iIconConstrain[0] == TIMG_WIDTH ) { + $this->iIcon->SetScale(1); + $tmp = $this->iIcon->GetWidthHeight(); + $this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[0]); + } + elseif( $this->iIconConstrain[0] == TIMG_HEIGHT ) { + $this->iIcon->SetScale(1); + $tmp = $this->iIcon->GetWidthHeight(); + $this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[1]); + } + $tmp = $this->iIcon->GetWidthHeight(); + $iheight = $tmp[1]; + } + else { + $iheight = 0; + } + if( $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->dir == 0 ) { + $pheight = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetHeight($aImg); + } + else { + $pheight = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetHeight($aImg)+1; + } + $prowspan = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iRowSpan; + return round(max($iheight,$pheight)/$prowspan) + $this->iMarginTop + $this->iMarginBottom; + } + + function SetAlign($aHorAlign='left',$aVertAlign='bottom') { + $aHorAlign = strtolower($aHorAlign); + $aVertAlign = strtolower($aVertAlign); + $chk = array('left','right','center','bottom','top','middle'); + if( !in_array($aHorAlign,$chk) || !in_array($aVertAlign,$chk) ) { + JpGraphError::RaiseL(27011,$aHorAlign,$aVertAlign); + } + $this->iVertAlign = $aVertAlign; + $this->iHorAlign = $aHorAlign; + } + + function AdjustMarginsForGrid() { + if( $this->iCol > 0 ) { + switch( $this->iGridStyle[0] ) { + case TGRID_SINGLE: $wf=1; break; + case TGRID_DOUBLE: $wf=3; break; + case TGRID_DOUBLE2: $wf=4; break; + } + $this->iMarginLeft += $this->iGridWeight[0]*$wf; + } + if( $this->iRow > 0 ) { + switch( $this->iGridStyle[1] ) { + case TGRID_SINGLE: $wf=1; break; + case TGRID_DOUBLE: $wf=3; break; + case TGRID_DOUBLE2: $wf=4; break; + } + $this->iMarginTop += $this->iGridWeight[1]*$wf; + } + if( $this->iRow+$this->iRowSpan-1 < $this->iTable->iSize[0]-1 ) { + switch( $this->iGridStyle[2] ) { + case TGRID_SINGLE: $wf=1; break; + case TGRID_DOUBLE: $wf=3; break; + case TGRID_DOUBLE2: $wf=4; break; + } + $this->iMarginBottom += $this->iGridWeight[2]*$wf; + } + if( $this->iCol+$this->iColSpan-1 < $this->iTable->iSize[1]-1 ) { + switch( $this->iGridStyle[3] ) { + case TGRID_SINGLE: $wf=1; break; + case TGRID_DOUBLE: $wf=3; break; + case TGRID_DOUBLE2: $wf=4; break; + } + $this->iMarginRight += $this->iGridWeight[3]*$wf; + } + } + + function StrokeVGrid($aImg,$aX,$aY,$aWidth,$aHeight,$aDir=1) { + // Left or right grid line + // For the right we increase the X-pos and for the right we decrease it. This is + // determined by the direction argument. + $idx = $aDir==1 ? 0 : 3; + + // We don't stroke the grid lines that are on the edge of the table since this is + // the place of the border. + if( ( ($this->iCol > 0 && $idx==0) || ($this->iCol+$this->iColSpan-1 < $this->iTable->iSize[1]-1 && $idx==3) ) + && $this->iGridWeight[$idx] > 0 ) { + $x = $aDir==1 ? $aX : $aX + $aWidth-1; + $y = $aY+$aHeight-1; + $aImg->SetColor($this->iGridColor[$idx]); + switch( $this->iGridStyle[$idx] ) { + case TGRID_SINGLE: + for( $i=0; $i < $this->iGridWeight[$idx]; ++$i ) + $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y); + break; + + case TGRID_DOUBLE: + for( $i=0; $i < $this->iGridWeight[$idx]; ++$i ) + $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y); + $x += $this->iGridWeight[$idx]*2; + for( $i=0; $i < $this->iGridWeight[$idx]; ++$i ) + $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y); + break; + + case TGRID_DOUBLE2: + for( $i=0; $i < $this->iGridWeight[$idx]*2; ++$i ) + $aImg->Line($x+$i*$aDir,$aY,$x+$i*$aDir,$y); + $x += $this->iGridWeight[$idx]*3; + for( $i=0; $i < $this->iGridWeight[$idx]; ++$i ) + $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y); + break; + } + } + } + + function StrokeHGrid($aImg,$aX,$aY,$aWidth,$aHeight,$aDir=1) { + // Top or bottom grid line + // For the left we increase the X-pos and for the right we decrease it. This is + // determined by the direction argument. + $idx = $aDir==1 ? 1 : 2; + + // We don't stroke the grid lines that are on the edge of the table since this is + // the place of the border. + if( ( ($this->iRow > 0 && $idx==1) || ($this->iRow+$this->iRowSpan-1 < $this->iTable->iSize[0]-1 && $idx==2) ) + && $this->iGridWeight[$idx] > 0) { + $y = $aDir==1 ? $aY : $aY+$aHeight-1; + $x = $aX+$aWidth-1; + $aImg->SetColor($this->iGridColor[$idx]); + switch( $this->iGridStyle[$idx] ) { + case TGRID_SINGLE: + for( $i=0; $i < $this->iGridWeight[$idx]; ++$i ) + $aImg->Line($aX,$y+$i, $x,$y+$i); + break; + + case TGRID_DOUBLE: + for( $i=0; $i < $this->iGridWeight[$idx]; ++$i ) + $aImg->Line($aX,$y+$i, $x,$y+$i); + $y += $this->iGridWeight[$idx]*2; + for( $i=0; $i < $this->iGridWeight[$idx]; ++$i ) + $aImg->Line($aX,$y+$i, $x,$y+$i); + break; + + case TGRID_DOUBLE2: + for( $i=0; $i < $this->iGridWeight[$idx]*2; ++$i ) + $aImg->Line($aX,$y+$i, $x,$y+$i); + $y += $this->iGridWeight[$idx]*3; + for( $i=0; $i < $this->iGridWeight[$idx]; ++$i ) + $aImg->Line($aX,$y+$i, $x,$y+$i); + break; + } + } + } + + function Stroke($aImg,$aX,$aY,$aWidth,$aHeight) { + // If this is a merged cell we only stroke if it is the parent cell. + // The parent cell holds the merged cell block + if( $this->iMerged && ($this->iRow != $this->iPRow || $this->iCol != $this->iPCol) ) { + return; + } + + if( $this->iBGColor != '' ) { + $aImg->SetColor($this->iBGColor); + $aImg->FilledRectangle($aX,$aY,$aX+$aWidth-1,$aY+$aHeight-1); + } + + $coords = $aX.','.$aY.','.($aX+$aWidth-1).','.$aY.','.($aX+$aWidth-1).','.($aY+$aHeight-1).','.$aX.','.($aY+$aHeight-1); + if( ! empty($this->iCSIMtarget) ) { + $this->iCSIMArea = 'iCSIMwintarget) ) { + $this->iCSIMArea .= " target=\"".$this->iCSIMwintarget."\""; + } + if( ! empty($this->iCSIMalt) ) { + $this->iCSIMArea .= ' alt="'.$this->iCSIMalt.'" title="'.$this->iCSIMalt."\" "; + } + $this->iCSIMArea .= " />\n"; + } + + $this->StrokeVGrid($aImg,$aX,$aY,$aWidth,$aHeight); + $this->StrokeVGrid($aImg,$aX,$aY,$aWidth,$aHeight,-1); + $this->StrokeHGrid($aImg,$aX,$aY,$aWidth,$aHeight); + $this->StrokeHGrid($aImg,$aX,$aY,$aWidth,$aHeight,-1); + + if( $this->iIcon !== null ) { + switch( $this->iHorAlign ) { + case 'left': + $x = $aX+$this->iMarginLeft; + $hanchor='left'; + break; + case 'center': + case 'middle': + $x = $aX+$this->iMarginLeft+round(($aWidth-$this->iMarginLeft-$this->iMarginRight)/2); + $hanchor='center'; + break; + case 'right': + $x = $aX+$aWidth-$this->iMarginRight-1; + $hanchor='right'; + break; + default: + JpGraphError::RaiseL(27012,$this->iHorAlign); + } + + switch( $this->iVertAlign ) { + case 'top': + $y = $aY+$this->iMarginTop; + $vanchor='top'; + break; + case 'center': + case 'middle': + $y = $aY+$this->iMarginTop+round(($aHeight-$this->iMarginTop-$this->iMarginBottom)/2); + $vanchor='center'; + break; + case 'bottom': + $y = $aY+$aHeight-1-$this->iMarginBottom; + $vanchor='bottom'; + break; + default: + JpGraphError::RaiseL(27012,$this->iVertAlign); + } + $this->iIcon->SetAnchor($hanchor,$vanchor); + $this->iIcon->_Stroke($aImg,$x,$y); + } + $this->iVal->SetColor($this->iFontColor); + $this->iVal->SetFont($this->iFF,$this->iFS,$this->iFSize); + switch( $this->iHorAlign ) { + case 'left': + $x = $aX+$this->iMarginLeft; + break; + case 'center': + case 'middle': + $x = $aX+$this->iMarginLeft+round(($aWidth-$this->iMarginLeft-$this->iMarginRight)/2); + break; + case 'right': + $x = $aX+$aWidth-$this->iMarginRight-1; + break; + default: + JpGraphError::RaiseL(27012,$this->iHorAlign); + } + // A workaround for the shortcomings in the TTF font handling in GD + // The anchor position for rotated text (=90) is to "short" so we add + // an offset based on the actual font size + if( $this->iVal->dir != 0 && $this->iVal->font_family >= 10 ) { + $aY += 4 + round($this->iVal->font_size*0.8); + } + switch( $this->iVertAlign ) { + case 'top': + $y = $aY+$this->iMarginTop; + break; + case 'center': + case 'middle': + $y = $aY+$this->iMarginTop+round(($aHeight-$this->iMarginTop-$this->iMarginBottom)/2); + //$y -= round($this->iVal->GetFontHeight($aImg)/2); + $y -= round($this->iVal->GetHeight($aImg)/2); + break; + case 'bottom': + //$y = $aY+$aHeight-1-$this->iMarginBottom-$this->iVal->GetFontHeight($aImg); + $y = $aY+$aHeight-$this->iMarginBottom-$this->iVal->GetHeight($aImg); + break; + default: + JpGraphError::RaiseL(27012,$this->iVertAlign); + } + $this->iVal->SetAlign($this->iHorAlign,'top'); + if( $this->iNumberFormat !== null && is_numeric($this->iVal->t) ) { + $this->iVal->t = sprintf($this->iNumberFormat,$this->iVal->t); + } + $this->iVal->Stroke($aImg,$x,$y); + } +} + +//--------------------------------------------------------------------- +// CLASS GTextTable +// Description: +// Graphic text table +//--------------------------------------------------------------------- +class GTextTable { + public $iCells = array(), $iSize=array(0,0); // Need to be public since they are used by the cell + private $iWidth=0, $iHeight=0; + private $iColWidth=NULL,$iRowHeight=NULL; + private $iImg=NULL; + private $iXPos=0, $iYPos=0; + private $iScaleXPos=null,$iScaleYPos=null; + private $iBGColor=''; + private $iBorderColor='black',$iBorderWeight=1; + private $iInit=false; + private $iYAnchor='top',$iXAnchor='left'; + /*----------------------------------------------------------------- + * First and second phase constructors + *----------------------------------------------------------------- + */ + function __construct() { + // Empty + } + + function Init($aRows=0,$aCols=0,$aFillText='') { + $this->iSize[0] = $aRows; + $this->iSize[1] = $aCols; + for($i=0; $i < $this->iSize[0]; ++$i) { + for($j=0; $j < $this->iSize[1]; ++$j) { + $this->iCells[$i][$j] = new GTextTableCell($aFillText,$i,$j); + $this->iCells[$i][$j]->Init($this); + } + } + $this->iInit=true; + } + + /*----------------------------------------------------------------- + * Outer border of table + *----------------------------------------------------------------- + */ + function SetBorder($aWeight=1,$aColor='black') { + $this->iBorderColor=$aColor; + $this->iBorderWeight = $aWeight; + } + + + /*----------------------------------------------------------------- + * Position in graph of table + *----------------------------------------------------------------- + */ + function SetPos($aX,$aY) { + $this->iXPos = $aX; + $this->iYPos = $aY; + } + + function SetScalePos($aX,$aY) { + $this->iScaleXPos = $aX; + $this->iScaleYPos = $aY; + } + + function SetAnchorPos($aXAnchor,$aYAnchor='top') { + $this->iXAnchor = $aXAnchor; + $this->iYAnchor = $aYAnchor; + } + + /*----------------------------------------------------------------- + * Setup country flag in a cell + *----------------------------------------------------------------- + */ + function SetCellCountryFlag($aRow,$aCol,$aFlag,$aScale=1.0,$aMix=100,$aStdSize=3) { + $this->_chkR($aRow); + $this->_chkC($aCol); + $this->iCells[$aRow][$aCol]->SetCountryFlag($aFlag,$aScale,$aMix,$aStdSize); + + } + + /*----------------------------------------------------------------- + * Setup image in a cell + *----------------------------------------------------------------- + */ + function SetCellImage($aRow,$aCol,$aFile,$aScale=1.0,$aMix=100) { + $this->_chkR($aRow); + $this->_chkC($aCol); + $this->iCells[$aRow][$aCol]->SetImage($aFile,$aScale,$aMix); + } + + function SetRowImage($aRow,$aFile,$aScale=1.0,$aMix=100) { + $this->_chkR($aRow); + for($j=0; $j < $this->iSize[1]; ++$j) { + $this->iCells[$aRow][$j]->SetImage($aFile,$aScale,$aMix); + } + } + + function SetColImage($aCol,$aFile,$aScale=1.0,$aMix=100) { + $this->_chkC($aCol); + for($j=0; $j < $this->iSize[0]; ++$j) { + $this->iCells[$j][$aCol]->SetImage($aFile,$aScale,$aMix); + } + } + + function SetImage($aFileR1,$aScaleC1=null,$aMixR2=null,$aC2=null,$aFile=null,$aScale=1.0,$aMix=100) { + if( $aScaleC1 !== null && $aMixR2!==null && $aC2!==null && $aFile!==null ) { + $this->_chkR($aArgR1); $this->_chkC($aC1); + $this->_chkR($aR2); $this->_chkC($aC2); + } + else { + if( $aScaleC1 !== null ) $aScale = $aScaleC1; + if( $aMixR2 !== null ) $aMix = $aMixR2; + $aFile = $aFileR1; + $aMixR2 = $this->iSize[0]-1; $aFileR1 = 0; + $aC2 = $this->iSize[1]-1; $aScaleC1 = 0; + } + for($i=$aArgR1; $i <= $aR2; ++$i) { + for($j=$aC1; $j <= $aC2; ++$j) { + $this->iCells[$i][$j]->SetImage($aFile,$aScale,$aMix); + } + } + } + + function SetCellImageConstrain($aRow,$aCol,$aType,$aVal) { + $this->_chkR($aRow); + $this->_chkC($aCol); + $this->iCells[$aRow][$aCol]->SetImageConstrain($aType,$aVal); + } + + /*----------------------------------------------------------------- + * Generate a HTML version of the table + *----------------------------------------------------------------- + */ + function toString() { + $t = ''; + for($i=0; $i < $this->iSize[0]; ++$i) { + $t .= ''; + for($j=0; $j < $this->iSize[1]; ++$j) { + $t .= ''; + } + $t .= ''; + } + $t .= '
'; + if( $this->iCells[$i][$j]->iMerged ) + $t .= 'M '; + $t .= 'val='.$this->iCells[$i][$j]->iVal->t; + $t .= ' (cs='.$this->iCells[$i][$j]->iColSpan. + ', rs='.$this->iCells[$i][$j]->iRowSpan.')'; + $t .= '
'; + return $t; + } + + /*----------------------------------------------------------------- + * Specify data for table + *----------------------------------------------------------------- + */ + function Set($aArg1,$aArg2=NULL,$aArg3=NULL) { + if( $aArg2===NULL && $aArg3===NULL ) { + if( is_array($aArg1) ) { + if( is_array($aArg1[0]) ) { + $m = count($aArg1); + // Find the longest row + $n=0; + for($i=0; $i < $m; ++$i) + $n = max(count($aArg1[$i]),$n); + for($i=0; $i < $m; ++$i) { + for($j=0; $j < $n; ++$j) { + if( isset($aArg1[$i][$j]) ){ + $this->_setcell($i,$j,(string)$aArg1[$i][$j]); + } + else { + $this->_setcell($i,$j); + } + } + } + $this->iSize[0] = $m; + $this->iSize[1] = $n; + $this->iInit=true; + } + else { + JpGraphError::RaiseL(27001); + //('Illegal argument to GTextTable::Set(). Array must be 2 dimensional'); + } + } + else { + JpGraphError::RaiseL(27002); + //('Illegal argument to GTextTable::Set()'); + } + } + else { + // Must be in the form (row,col,val) + $this->_chkR($aArg1); + $this->_chkC($aArg2); + $this->_setcell($aArg1,$aArg2,(string)$aArg3); + } + } + + /*--------------------------------------------------------------------- + * Cell margin setting + *--------------------------------------------------------------------- + */ + function SetPadding($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aPad=null) { + if( $aC1 !== null && $aR2!==null && $aC2!==null && $aPad!==null ) { + $this->_chkR($aArgR1); $this->_chkC($aC1); + $this->_chkR($aR2); $this->_chkC($aC2); + } + else { + $aPad = $aArgR1; + $aR2 = $this->iSize[0]-1; $aArgR1 = 0; + $aC2 = $this->iSize[1]-1; $aC1 = 0; + } + for($i=$aArgR1; $i <= $aR2; ++$i) { + for($j=$aC1; $j <= $aC2; ++$j) { + $this->iCells[$i][$j]->SetMargin($aPad,$aPad,$aPad,$aPad); + } + } + } + + function SetRowPadding($aRow,$aPad) { + $this->_chkR($aRow); + for($j=0; $j < $this->iSize[1]; ++$j) { + $this->iCells[$aRow][$j]->SetMargin($aPad,$aPad,$aPad,$aPad); + } + } + + function SetColPadding($aCol,$aPad) { + $this->_chkC($aCol); + for($j=0; $j < $this->iSize[0]; ++$j) { + $this->iCells[$j][$aCol]->SetMargin($aPad,$aPad,$aPad,$aPad); + } + } + + function SetCellPadding($aRow,$aCol,$aPad) { + $this->_chkR($aRow); + $this->_chkC($aCol); + $this->iCells[$aRow][$aCol]->SetMargin($aPad,$aPad,$aPad,$aPad); + } + + + /*--------------------------------------------------------------------- + * Cell text orientation setting + *--------------------------------------------------------------------- + */ + function SetTextOrientation($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aO=null) { + if( $aC1 !== null && $aR2!==null && $aC2!==null && $aPad!==null ) { + $this->_chkR($aArgR1); $this->_chkC($aC1); + $this->_chkR($aR2); $this->_chkC($aC2); + } + else { + $aO = $aArgR1; + $aR2 = $this->iSize[0]-1; $aArgR1 = 0; + $aC2 = $this->iSize[1]-1; $aC1 = 0; + } + for($i=$aArgR1; $i <= $aR2; ++$i) { + for($j=$aC1; $j <= $aC2; ++$j) { + $this->iCells[$i][$j]->iVal->SetOrientation($aO); + } + } + } + + function SetRowTextOrientation($aRow,$aO) { + $this->_chkR($aRow); + for($j=0; $j < $this->iSize[1]; ++$j) { + $this->iCells[$aRow][$j]->iVal->SetOrientation($aO); + } + } + + function SetColTextOrientation($aCol,$aO) { + $this->_chkC($aCol); + for($j=0; $j < $this->iSize[0]; ++$j) { + $this->iCells[$j][$aCol]->iVal->SetOrientation($aO); + } + } + + function SetCellTextOrientation($aRow,$aCol,$aO) { + $this->_chkR($aRow); + $this->_chkC($aCol); + $this->iCells[$aRow][$aCol]->iVal->SetOrientation($aO); + } + + + + + /*--------------------------------------------------------------------- + * Font color setting + *--------------------------------------------------------------------- + */ + + function SetColor($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aArg=null) { + if( $aC1 !== null && $aR2!==null && $aC2!==null && $aArg!==null ) { + $this->_chkR($aArgR1); $this->_chkC($aC1); + $this->_chkR($aR2); $this->_chkC($aC2); + } + else { + $aArg = $aArgR1; + $aR2 = $this->iSize[0]-1; $aArgR1 = 0; + $aC2 = $this->iSize[1]-1; $aC1 = 0; + } + for($i=$aArgR1; $i <= $aR2; ++$i) { + for($j=$aC1; $j <= $aC2; ++$j) { + $this->iCells[$i][$j]->SetFontColor($aArg); + } + } + } + + function SetRowColor($aRow,$aColor) { + $this->_chkR($aRow); + for($j=0; $j < $this->iSize[1]; ++$j) { + $this->iCells[$aRow][$j]->SetFontColor($aColor); + } + } + + function SetColColor($aCol,$aColor) { + $this->_chkC($aCol); + for($i=0; $i < $this->iSize[0]; ++$i) { + $this->iCells[$i][$aCol]->SetFontColor($aColor); + } + } + + function SetCellColor($aRow,$aCol,$aColor) { + $this->_chkR($aRow); + $this->_chkC($aCol); + $this->iCells[$aRow][$aCol]->SetFontColor($aColor); + } + + /*--------------------------------------------------------------------- + * Fill color settings + *--------------------------------------------------------------------- + */ + + function SetFillColor($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aArg=null) { + if( $aC1 !== null && $aR2!==null && $aC2!==null && $aArg!==null ) { + $this->_chkR($aArgR1); $this->_chkC($aC1); + $this->_chkR($aR2); $this->_chkC($aC2); + for($i=$aArgR1; $i <= $aR2; ++$i) { + for($j=$aC1; $j <= $aC2; ++$j) { + $this->iCells[$i][$j]->SetFillColor($aArg); + } + } + } + else { + $this->iBGColor = $aArgR1; + } + } + + function SetRowFillColor($aRow,$aColor) { + $this->_chkR($aRow); + for($j=0; $j < $this->iSize[1]; ++$j) { + $this->iCells[$aRow][$j]->SetFillColor($aColor); + } + } + + function SetColFillColor($aCol,$aColor) { + $this->_chkC($aCol); + for($i=0; $i < $this->iSize[0]; ++$i) { + $this->iCells[$i][$aCol]->SetFillColor($aColor); + } + } + + function SetCellFillColor($aRow,$aCol,$aColor) { + $this->_chkR($aRow); + $this->_chkC($aCol); + $this->iCells[$aRow][$aCol]->SetFillColor($aColor); + } + + /*--------------------------------------------------------------------- + * Font family setting + *--------------------------------------------------------------------- + */ + function SetFont() { + $numargs = func_num_args(); + if( $numargs == 2 || $numargs == 3 ) { + $aFF = func_get_arg(0); + $aFS = func_get_arg(1); + if( $numargs == 3 ) + $aFSize=func_get_arg(2); + else + $aFSize=10; + $aR2 = $this->iSize[0]-1; $aR1 = 0; + $aC2 = $this->iSize[1]-1; $aC1 = 0; + + } + elseif($numargs == 6 || $numargs == 7 ) { + $aR1 = func_get_arg(0); $aC1 = func_get_arg(1); + $aR2 = func_get_arg(2); $aC2 = func_get_arg(3); + $aFF = func_get_arg(4); $aFS = func_get_arg(5); + if( $numargs == 7 ) + $aFSize=func_get_arg(6); + else + $aFSize=10; + } + else { + JpGraphError::RaiseL(27003); + //('Wrong number of arguments to GTextTable::SetColor()'); + } + $this->_chkR($aR1); $this->_chkC($aC1); + $this->_chkR($aR2); $this->_chkC($aC2); + for($i=$aR1; $i <= $aR2; ++$i) { + for($j=$aC1; $j <= $aC2; ++$j) { + $this->iCells[$i][$j]->SetFont($aFF,$aFS,$aFSize); + } + } + } + + function SetRowFont($aRow,$aFF,$aFS,$aFSize=10) { + $this->_chkR($aRow); + for($j=0; $j < $this->iSize[1]; ++$j) { + $this->iCells[$aRow][$j]->SetFont($aFF,$aFS,$aFSize); + } + } + + function SetColFont($aCol,$aFF,$aFS,$aFSize=10) { + $this->_chkC($aCol); + for($i=0; $i < $this->iSize[0]; ++$i) { + $this->iCells[$i][$aCol]->SetFont($aFF,$aFS,$aFSize); + } + } + + function SetCellFont($aRow,$aCol,$aFF,$aFS,$aFSize=10) { + $this->_chkR($aRow); + $this->_chkC($aCol); + $this->iCells[$aRow][$aCol]->SetFont($aFF,$aFS,$aFSize); + } + + /*--------------------------------------------------------------------- + * Cell align settings + *--------------------------------------------------------------------- + */ + + function SetAlign($aR1HAlign=null,$aC1VAlign=null,$aR2=null,$aC2=null,$aHArg=null,$aVArg='center') { + if( $aC1VAlign !== null && $aR2!==null && $aC2!==null && $aHArg!==null ) { + $this->_chkR($aR1HAlign); $this->_chkC($aC1VAlign); + $this->_chkR($aR2); $this->_chkC($aC2); + } + else { + if( $aR1HAlign === null ) { + JpGraphError::RaiseL(27010); + } + if( $aC1VAlign === null ) { + $aC1VAlign = 'center'; + } + $aHArg = $aR1HAlign; + $aVArg = $aC1VAlign === null ? 'center' : $aC1VAlign ; + $aR2 = $this->iSize[0]-1; $aR1HAlign = 0; + $aC2 = $this->iSize[1]-1; $aC1VAlign = 0; + } + for($i=$aR1HAlign; $i <= $aR2; ++$i) { + for($j=$aC1VAlign; $j <= $aC2; ++$j) { + $this->iCells[$i][$j]->SetAlign($aHArg,$aVArg); + } + } + } + + function SetCellAlign($aRow,$aCol,$aHorAlign,$aVertAlign='bottom') { + $this->_chkR($aRow); + $this->_chkC($aCol); + $this->iCells[$aRow][$aCol]->SetAlign($aHorAlign,$aVertAlign); + } + + function SetRowAlign($aRow,$aHorAlign,$aVertAlign='bottom') { + $this->_chkR($aRow); + for($j=0; $j < $this->iSize[1]; ++$j) { + $this->iCells[$aRow][$j]->SetAlign($aHorAlign,$aVertAlign); + } + } + + function SetColAlign($aCol,$aHorAlign,$aVertAlign='bottom') { + $this->_chkC($aCol); + for($i=0; $i < $this->iSize[0]; ++$i) { + $this->iCells[$i][$aCol]->SetAlign($aHorAlign,$aVertAlign); + } + } + + /*--------------------------------------------------------------------- + * Cell number format + *--------------------------------------------------------------------- + */ + + function SetNumberFormat($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aArg=null) { + if( $aC1 !== null && $aR2!==null && $aC2!==null && $aArg!==null ) { + $this->_chkR($aArgR1); $this->_chkC($aC1); + $this->_chkR($aR2); $this->_chkC($aC2); + } + else { + $aArg = $aArgR1; + $aR2 = $this->iSize[0]-1; $aArgR1 = 0; + $aC2 = $this->iSize[1]-1; $aC1 = 0; + } + if( !is_string($aArg) ) { + JpGraphError::RaiseL(27013); // argument must be a string + } + for($i=$aArgR1; $i <= $aR2; ++$i) { + for($j=$aC1; $j <= $aC2; ++$j) { + $this->iCells[$i][$j]->SetNumberFormat($aArg); + } + } + } + + function SetRowNumberFormat($aRow,$aF) { + $this->_chkR($aRow); + if( !is_string($aF) ) { + JpGraphError::RaiseL(27013); // argument must be a string + } + for($j=0; $j < $this->iSize[1]; ++$j) { + $this->iCells[$aRow][$j]->SetNumberFormat($aF); + } + } + + function SetColNumberFormat($aCol,$aF) { + $this->_chkC($aCol); + if( !is_string($aF) ) { + JpGraphError::RaiseL(27013); // argument must be a string + } + for($i=0; $i < $this->iSize[0]; ++$i) { + $this->iCells[$i][$aCol]->SetNumberFormat($aF); + } + } + + function SetCellNumberFormat($aRow,$aCol,$aF) { + $this->_chkR($aRow); $this->_chkC($aCol); + if( !is_string($aF) ) { + JpGraphError::RaiseL(27013); // argument must be a string + } + $this->iCells[$aRow][$aCol]->SetNumberFormat($aF); + } + + /*--------------------------------------------------------------------- + * Set row and column min size + *--------------------------------------------------------------------- + */ + + function SetMinColWidth($aColWidth,$aWidth=null) { + // If there is only one argument this means that all + // columns get set to the same width + if( $aWidth===null ) { + for($i=0; $i < $this->iSize[1]; ++$i) { + $this->iColWidth[$i] = $aColWidth; + } + } + else { + $this->_chkC($aColWidth); + $this->iColWidth[$aColWidth] = $aWidth; + } + } + + function SetMinRowHeight($aRowHeight,$aHeight=null) { + // If there is only one argument this means that all + // rows get set to the same height + if( $aHeight===null ) { + for($i=0; $i < $this->iSize[0]; ++$i) { + $this->iRowHeight[$i] = $aRowHeight; + } + } + else { + $this->_chkR($aRowHeight); + $this->iRowHeight[$aRowHeight] = $aHeight; + } + } + + /*--------------------------------------------------------------------- + * Grid line settings + *--------------------------------------------------------------------- + */ + + function SetGrid($aWeight=1,$aColor='black',$aStyle=TGRID_SINGLE) { + $rc = $this->iSize[0]; + $cc = $this->iSize[1]; + for($i=0; $i < $rc; ++$i) { + for($j=0; $j < $cc; ++$j) { + $this->iCells[$i][$j]->SetGridColor($aColor,$aColor); + $this->iCells[$i][$j]->SetGridWeight($aWeight,$aWeight); + $this->iCells[$i][$j]->SetGridStyle($aStyle); + } + } + } + + function SetColGrid($aCol,$aWeight=1,$aColor='black',$aStyle=TGRID_SINGLE) { + $this->_chkC($aCol); + for($i=0; $i < $this->iSize[0]; ++$i) { + $this->iCells[$i][$aCol]->SetGridWeight($aWeight); + $this->iCells[$i][$aCol]->SetGridColor($aColor); + $this->iCells[$i][$aCol]->SetGridStyle($aStyle); + } + } + + function SetRowGrid($aRow,$aWeight=1,$aColor='black',$aStyle=TGRID_SINGLE) { + $this->_chkR($aRow); + for($j=0; $j < $this->iSize[1]; ++$j) { + $this->iCells[$aRow][$j]->SetGridWeight(NULL,$aWeight); + $this->iCells[$aRow][$j]->SetGridColor(NULL,$aColor); + $this->iCells[$aRow][$j]->SetGridStyle(NULL,$aStyle); + } + } + + /*--------------------------------------------------------------------- + * Merge cells + *--------------------------------------------------------------------- + */ + + function MergeRow($aRow,$aHAlign='center',$aVAlign='center') { + $this->_chkR($aRow); + $this->MergeCells($aRow,0,$aRow,$this->iSize[1]-1,$aHAlign,$aVAlign); + } + + function MergeCol($aCol,$aHAlign='center',$aVAlign='center') { + $this->_chkC($aCol); + $this->MergeCells(0,$aCol,$this->iSize[0]-1,$aCol,$aHAlign,$aVAlign); + } + + function MergeCells($aR1,$aC1,$aR2,$aC2,$aHAlign='center',$aVAlign='center') { + if( $aR1 > $aR2 || $aC1 > $aC2 ) { + JpGraphError::RaiseL(27004); + //('GTextTable::MergeCells(). Specified cell range to be merged is not valid.'); + } + $this->_chkR($aR1); $this->_chkC($aC1); + $this->_chkR($aR2); $this->_chkC($aC2); + $rspan = $aR2-$aR1+1; + $cspan = $aC2-$aC1+1; + // Setup the parent cell for this merged group + if( $this->iCells[$aR1][$aC1]->IsMerged() ) { + JpGraphError::RaiseL(27005,$aR1,$aC1,$aR2,$aC2); + //("Cannot merge already merged cells in the range ($aR1,$aC1), ($aR2,$aC2)"); + } + $this->iCells[$aR1][$aC1]->SetRowColSpan($rspan,$cspan); + $this->iCells[$aR1][$aC1]->SetAlign($aHAlign,$aVAlign); + for($i=$aR1; $i <= $aR2; ++$i) { + for($j=$aC1; $j <= $aC2; ++$j) { + if( ! ($i == $aR1 && $j == $aC1) ) { + if( $this->iCells[$i][$j]->IsMerged() ) { + JpGraphError::RaiseL(27005,$aR1,$aC1,$aR2,$aC2); + //("Cannot merge already merged cells in the range ($aR1,$aC1), ($aR2,$aC2)"); + } + $this->iCells[$i][$j]->SetMerged($aR1,$aC1,true); + } + } + } + } + + + /*--------------------------------------------------------------------- + * CSIM methods + *--------------------------------------------------------------------- + */ + + function SetCSIMTarget($aTarget,$aAlt=null,$aAutoTarget=false) { + $m = $this->iSize[0]; + $n = $this->iSize[1]; + $csim = ''; + for($i=0; $i < $m; ++$i) { + for($j=0; $j < $n; ++$j) { + if( $aAutoTarget ) + $t = $aTarget."?row=$i&col=$j"; + else + $t = $aTarget; + $this->iCells[$i][$j]->SetCSIMTarget($t,$aAlt); + } + } + } + + function SetCellCSIMTarget($aRow,$aCol,$aTarget,$aAlt=null) { + $this->_chkR($aRow); + $this->_chkC($aCol); + $this->iCells[$aRow][$aCol]->SetCSIMTarget($aTarget,$aAlt); + } + + /*--------------------------------------------------------------------- + * Private methods + *--------------------------------------------------------------------- + */ + + function GetCSIMAreas() { + $m = $this->iSize[0]; + $n = $this->iSize[1]; + $csim = ''; + for($i=0; $i < $m; ++$i) { + for($j=0; $j < $n; ++$j) { + $csim .= $this->iCells[$i][$j]->GetCSIMArea(); + } + } + return $csim; + } + + function _chkC($aCol) { + if( ! $this->iInit ) { + JpGraphError::Raise(27014); // Table not initialized + } + if( $aCol < 0 || $aCol >= $this->iSize[1] ) + JpGraphError::RaiseL(27006,$aCol); + //("GTextTable:\nColumn argument ($aCol) is outside specified table size."); + } + + function _chkR($aRow) { + if( ! $this->iInit ) { + JpGraphError::Raise(27014); // Table not initialized + } + if( $aRow < 0 || $aRow >= $this->iSize[0] ) + JpGraphError::RaiseL(27007,$aRow); + //("GTextTable:\nRow argument ($aRow) is outside specified table size."); + } + + function _getScalePos() { + if( $this->iScaleXPos === null || $this->iScaleYPos === null ) { + return false; + } + return array($this->iScaleXPos, $this->iScaleYPos); + } + + function _autoSizeTable($aImg) { + // Get maximum column width and row height + $m = $this->iSize[0]; + $n = $this->iSize[1]; + $w=1;$h=1; + + // Get maximum row height per row + for($i=0; $i < $m; ++$i) { + $h=0; + for($j=0; $j < $n; ++$j) { + $h = max($h,$this->iCells[$i][$j]->GetHeight($aImg)); + } + if( isset($this->iRowHeight[$i]) ) { + $this->iRowHeight[$i] = max($h,$this->iRowHeight[$i]); + } + else + $this->iRowHeight[$i] = $h; + } + + // Get maximum col width per columns + for($j=0; $j < $n; ++$j) { + $w=0; + for($i=0; $i < $m; ++$i) { + $w = max($w,$this->iCells[$i][$j]->GetWidth($aImg)); + } + if( isset($this->iColWidth[$j]) ) { + $this->iColWidth[$j] = max($w,$this->iColWidth[$j]); + } + else + $this->iColWidth[$j] = $w; + } + } + + function _setcell($aRow,$aCol,$aVal='') { + if( isset($this->iCells[$aRow][$aCol]) ) { + $this->iCells[$aRow][$aCol]->Set($aVal); + } + else { + $this->iCells[$aRow][$aCol] = new GTextTableCell((string)$aVal,$aRow,$aCol); + $this->iCells[$aRow][$aCol]->Init($this); + } + } + + function StrokeWithScale($aImg,$aXScale,$aYScale) { + if( is_numeric($this->iScaleXPos) && is_numeric($this->iScaleYPos) ) { + $x = round($aXScale->Translate($this->iScaleXPos)); + $y = round($aYScale->Translate($this->iScaleYPos)); + $this->Stroke($aImg,$x,$y); + } + else { + $this->Stroke($aImg); + } + } + + function Stroke($aImg,$aX=NULL,$aY=NULL) { + if( $aX !== NULL && $aY !== NULL ) { + $this->iXPos = $aX; + $this->iYPos = $aY; + } + + $rc = $this->iSize[0]; // row count + $cc = $this->iSize[1]; // column count + + if( $rc == 0 || $cc == 0 ) { + JpGraphError::RaiseL(27009); + } + + // Adjust margins of each cell based on the weight of the grid. Each table grid line + // is actually occupying the left side and top part of each cell. + for($j=0; $j < $cc; ++$j) { + $this->iCells[0][$j]->iMarginTop += $this->iBorderWeight; + } + for($i=0; $i < $rc; ++$i) { + $this->iCells[$i][0]->iMarginLeft += $this->iBorderWeight; + } + for($i=0; $i < $rc; ++$i) { + for($j=0; $j < $cc; ++$j) { + $this->iCells[$i][$j]->AdjustMarginsForGrid(); + } + } + + // adjust row and column size depending on cell content + $this->_autoSizeTable($aImg); + + if( $this->iSize[1] != count($this->iColWidth) || $this->iSize[0] != count($this->iRowHeight) ) { + JpGraphError::RaiseL(27008); + //('Column and row size arrays must match the dimesnions of the table'); + } + + // Find out overall table size + $width=0; + for($i=0; $i < $cc; ++$i) { + $width += $this->iColWidth[$i]; + } + $height=0; + for($i=0; $i < $rc; ++$i) { + $height += $this->iRowHeight[$i]; + } + + // Adjust the X,Y position to alway be at the top left corner + // The anchor position, i.e. how the client want to interpret the specified + // x and y coordinate must be taken into account + switch( strtolower($this->iXAnchor) ) { + case 'left' : + break; + case 'center': + $this->iXPos -= round($width/2); + break; + case 'right': + $this->iXPos -= $width; + break; + } + switch( strtolower($this->iYAnchor) ) { + case 'top' : + break; + case 'center': + case 'middle': + $this->iYPos -= round($height/2); + break; + case 'bottom': + $this->iYPos -= $height; + break; + } + + // Set the overall background color of the table if set + if( $this->iBGColor !== '' ) { + $aImg->SetColor($this->iBGColor); + $aImg->FilledRectangle($this->iXPos,$this->iYPos,$this->iXPos+$width,$this->iYPos+$height); + } + + // Stroke all cells + $rpos=$this->iYPos; + for($i=0; $i < $rc; ++$i) { + $cpos=$this->iXPos; + for($j=0; $j < $cc; ++$j) { + // Calculate width and height of this cell if it is spanning + // more than one column or row + $cwidth=0; + for( $k=0; $k < $this->iCells[$i][$j]->iColSpan; ++$k ) { + $cwidth += $this->iColWidth[$j+$k]; + } + $cheight=0; + for( $k=0; $k < $this->iCells[$i][$j]->iRowSpan; ++$k ) { + $cheight += $this->iRowHeight[$i+$k]; + } + + $this->iCells[$i][$j]->Stroke($aImg,$cpos,$rpos,$cwidth,$cheight); + $cpos += $this->iColWidth[$j]; + } + $rpos += $this->iRowHeight[$i]; + } + + // Stroke outer border + $aImg->SetColor($this->iBorderColor); + if( $this->iBorderWeight == 1 ) + $aImg->Rectangle($this->iXPos,$this->iYPos,$this->iXPos+$width,$this->iYPos+$height); + else { + for( $i=0; $i < $this->iBorderWeight; ++$i ) + $aImg->Rectangle($this->iXPos+$i,$this->iYPos+$i, + $this->iXPos+$width-1+$this->iBorderWeight-$i, + $this->iYPos+$height-1+$this->iBorderWeight-$i); + } + } +} + +/* + EOF + */ +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_text.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_text.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_text.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_text.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -6,7 +6,7 @@ // Created: 2001-01-08 (Refactored to separate file 2008-08-01) // Ver: $Id: jpgraph_text.inc.php 1844 2009-09-26 17:05:31Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== @@ -15,12 +15,12 @@ // Description: Arbitrary text object that can be added to the graph //=================================================== class Text { - public $t,$margin=0; + public $t; public $x=0,$y=0,$halign="left",$valign="top",$color=array(0,0,0); public $hide=false, $dir=0; public $iScalePosY=null,$iScalePosX=null; public $iWordwrap=0; - public $font_family=FF_FONT1,$font_style=FS_NORMAL,$font_size=12; + public $font_family=FF_DEFAULT,$font_style=FS_NORMAL; // old. FF_FONT1 protected $boxed=false; // Should the text be boxed protected $paragraph_align="left"; protected $icornerradius=0,$ishadowwidth=3; @@ -28,6 +28,10 @@ protected $iCSIMarea='',$iCSIMalt='',$iCSIMtarget='',$iCSIMWinTarget=''; private $iBoxType = 1; // Which variant of filled box around text we want + // for __get, __set + private $_margin; + private $_font_size=8; // old. 12 + //--------------- // CONSTRUCTOR @@ -171,28 +175,28 @@ // Total width of text function GetWidth($aImg) { - $aImg->SetFont($this->font_family,$this->font_style,$this->font_size); + $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size); $w = $aImg->GetTextWidth($this->t,$this->dir); return $w; } // Hight of font function GetFontHeight($aImg) { - $aImg->SetFont($this->font_family,$this->font_style,$this->font_size); + $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size); $h = $aImg->GetFontHeight(); return $h; } function GetTextHeight($aImg) { - $aImg->SetFont($this->font_family,$this->font_style,$this->font_size); + $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size); $h = $aImg->GetTextHeight($this->t,$this->dir); return $h; } function GetHeight($aImg) { // Synonym for GetTextHeight() - $aImg->SetFont($this->font_family,$this->font_style,$this->font_size); + $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size); $h = $aImg->GetTextHeight($this->t,$this->dir); return $h; } @@ -246,7 +250,7 @@ if( $this->y < 1 && $this->y > 0 ) $this->y *= $aImg->height; $aImg->PushColor($this->color); - $aImg->SetFont($this->font_family,$this->font_style,$this->font_size); + $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size); $aImg->SetTextAlign($this->halign,$this->valign); if( $this->boxed ) { @@ -296,6 +300,27 @@ $aImg->PopColor($this->color); } + + function __get($name) { + + if (strpos($name, 'raw_') !== false) { + // if $name == 'raw_left_margin' , return $this->_left_margin; + $variable_name = '_' . str_replace('raw_', '', $name); + return $this->$variable_name; + } + + $variable_name = '_' . $name; + + if (isset($this->$variable_name)) { + return $this->$variable_name * SUPERSAMPLING_SCALE; + } else { + JpGraphError::RaiseL('25132', $name); + } + } + + function __set($name, $value) { + $this->{'_'.$name} = $value; + } } // Class diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_theme.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_theme.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_theme.inc.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_theme.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,136 @@ +color_index = 0; + } + /** + * + */ + abstract function GetColorList(); + + /** + * + */ + abstract function ApplyPlot($plot); + + + /** + * + */ + function SetupPlot($plot) { + if (is_array($plot)) { + foreach ($plot as $obj) { + $this->ApplyPlot($obj); + } + } else { + $this->ApplyPlot($plot); + } + } + + /** + * + */ + function ApplyGraph($graph) { + + $this->graph = $graph; + $method_name = ''; + + if (get_class($graph) == 'Graph') { + $method_name = 'SetupGraph'; + } else { + $method_name = 'Setup' . get_class($graph); + } + + if (method_exists($this, $method_name)) { + $this->$method_name($graph); + } else { + JpGraphError::RaiseL(30001, $method_name, $method_name); //Theme::%s() is not defined. \nPlease make %s(\$graph) function in your theme classs. + } + } + + /** + * + */ + function PreStrokeApply($graph) { + } + + /** + * + */ + function GetThemeColors($num = 30) { + $result_list = array(); + + $old_index = $this->color_index; + $this->color_index = 0; + $count = 0; + + $i = 0; + while (true) { + for ($j = 0; $j < count($this->GetColorList()); $j++) { + if (++$count > $num) { + break 2; + } + $result_list[] = $this->GetNextColor(); + } + $i++; + } + + $this->color_index = $old_index; + + return $result_list; + } + + /** + * + */ + function GetNextColor() { + $color_list = $this->GetColorList(); + + $color = null; + if (isset($color_list[$this->color_index])) { + $color = $color_list[$this->color_index]; + } else { + $color_count = count($color_list); + if ($color_count <= $this->color_index) { + $color_tmp = $color_list[$this->color_index % $color_count]; + $brightness = 1.0 - intval($this->color_index / $color_count) * 0.2; + $rgb = new RGB(); + $color = $color_tmp . ':' . $brightness; + $color = $rgb->Color($color); + $alpha = array_pop($color); + $color = $rgb->tryHexConversion($color); + if ($alpha) { + $color .= '@' . $alpha; + } + } + } + + $this->color_index++; + + return $color; + } + +} // Class + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_ttf.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_ttf.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_ttf.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_ttf.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2006-11-19 // Ver: $Id: jpgraph_ttf.inc.php 1858 2009-09-28 14:39:51Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== // TTF Font families @@ -144,6 +144,11 @@ define('ASSUME_EUCJP_ENCODING',false); +// Default font family +define('FF_DEFAULT', FF_DV_SANSSERIF); + + + //================================================================= // CLASS LanguageConv // Description: @@ -467,37 +472,46 @@ } $ff = @$fam[$style]; - if( is_array($ff) ) { - // There are several optional file names. They are tried in order - // and the first one found is used - $n = count($ff); - } else { - $n = 1; + // There are several optional file names. They are tried in order + // and the first one found is used + if( !is_array($ff) ) { $ff = array($ff); } - $i = 0; - do { - $f = $ff[$i]; + + $jpgraph_font_dir = dirname(__FILE__).'/fonts/'; + + foreach ($ff as $font_file) { // All font families are guaranteed to have the normal style - if( $f==='' ) + if( $font_file==='' ) 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 ) { + if( !$font_file ) { JpGraphError::RaiseL(25048,$fam);//("Unknown font style specification [$fam]."); } + // check jpgraph/src/fonts dir + $jpgraph_font_file = $jpgraph_font_dir . $font_file; + if (file_exists($jpgraph_font_file) === true && is_readable($jpgraph_font_file) === true) { + $font_file = $jpgraph_font_file; + break; + } + + // check OS font dir if ($family >= FF_MINCHO && $family <= FF_PGOTHIC) { - $f = MBTTF_DIR.$f; + $font_file = MBTTF_DIR.$font_file; } else { - $f = TTF_DIR.$f; + $font_file = TTF_DIR.$font_file; + } + if (file_exists($font_file) === true && is_readable($font_file) === true) { + break; } - ++$i; - } while( $i < $n && (file_exists($f) === false || is_readable($f) === false) ); + } - if( !file_exists($f) ) { - JpGraphError::RaiseL(25049,$f);//("Font file \"$f\" is not readable or does not exist."); + if( !file_exists($font_file) ) { + JpGraphError::RaiseL(25049,$font_file);//("Font file \"$font_file\" is not readable or does not exist."); } - return $f; + + return $font_file; } function SetUserFont($aNormal,$aBold='',$aItalic='',$aBoldIt='') { diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_utils.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_utils.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_utils.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_utils.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2005-11-20 // Ver: $Id: jpgraph_utils.inc.php 1777 2009-08-23 17:34:36Z ljp $ // - // Copyright (c) Aditus Consulting. All rights reserved. + // Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -682,4 +682,4 @@ } -?> \ No newline at end of file +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_windrose.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_windrose.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/jpgraph_windrose.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/jpgraph_windrose.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,1566 @@ +iZeroSum=0; + foreach( $aData as $idx => $legdata ) { + $legsum = array_sum($legdata); + $maxnum = max($maxnum,count($legdata)-1); + $max = max($legsum-$legdata[0],$max); + $totlegsum += $legsum; + $this->iZeroSum += $legdata[0] ; + } + if( round($totlegsum) > 100 ) { + JpGraphError::RaiseL(22001,$legsum); + //("Total percentage for all windrose legs in a windrose plot can not exceed 100% !\n(Current max is: ".$legsum.')'); + } + $this->iMax = $max ; + $this->iMaxNum = $maxnum; + $this->iNumCirc = $this->GetNumCirc(); + $this->iMaxVal = $this->iNumCirc * $this->iDelta ; + } + + // Return number of grid circles + function GetNumCirc() { + // Never return less than 1 circles + $num = ceil($this->iMax / $this->iDelta); + return max(1,$num) ; + } + + function SetMaxValue($aMax) { + $this->iMax = $aMax; + $this->iNumCirc = $this->GetNumCirc(); + $this->iMaxVal = $this->iNumCirc * $this->iDelta ; + } + + // Set step size for circular grid + function Set($aMax,$aDelta=null) { + if( $aDelta==null ) { + $this->SetMaxValue($aMax); + return; + } + $this->iDelta = $aDelta; + $this->iNumCirc = ceil($aMax/$aDelta); //$this->GetNumCirc(); + $this->iMaxVal = $this->iNumCirc * $this->iDelta ; + $this->iMax=$aMax; + // Remember that user has specified interval so don't + // do autoscaling + $this->iManualScale = true; + } + + function AutoScale($aRadius,$aMinDist=30) { + + if( $this->iManualScale ) return; + + // Make sure distance (in pixels) between two circles + // is never less than $aMinDist pixels + $tst = ceil($aRadius / $this->iNumCirc) ; + + while( $tst <= $aMinDist && $this->iDelta < 100 ) { + $this->iDelta += 5; + $tst = ceil($aRadius / $this->GetNumCirc()) ; + } + + if( $this->iDelta >= 100 ) { + JpGraphError::RaiseL(22002);//('Graph is too small to have a scale. Please make the graph larger.'); + } + + // If the distance is to large try with multiples of 2 instead + if( $tst > $aMinDist * 3 ) { + $this->iDelta = 2; + $tst = ceil($aRadius / $this->iNumCirc) ; + + while( $tst <= $aMinDist && $this->iDelta < 100 ) { + $this->iDelta += 2; + $tst = ceil($aRadius / $this->GetNumCirc()) ; + } + + if( $this->iDelta >= 100 ) { + JpGraphError::RaiseL(22002); //('Graph is too small to have a scale. Please make the graph larger.'); + } + } + + $this->iNumCirc = $this->GetNumCirc(); + $this->iMaxVal = $this->iNumCirc * $this->iDelta ; + } + + // Return max of all leg values + function GetMax() { + return $this->iMax; + } + + function Hide($aFlg=true) { + $this->iHideLabels = $aFlg; + } + + function SetAngle($aAngle) { + $this->iAngle = $aAngle ; + } + + // Translate a Leg value to radius distance + function RelTranslate($aVal,$r,$ri) { + $tv = round($aVal/$this->iMaxVal*($r-$ri)); + return $tv ; + } + + function SetLabelAlign($aAlign) { + $this->iLblAlign = $aAlign ; + } + + function SetLabelFormat($aFmt) { + $this->iLblFmt = $aFmt ; + } + + function SetLabelFillColor($aBkgColor,$aBorderColor=false) { + + $this->iFontBkgColor = $aBkgColor; + if( $aBorderColor === false ) { + $this->iFontFrameColor = $aBkgColor; + } + else { + $this->iFontFrameColor = $aBorderColor; + } + } + + function SetFontColor($aColor) { + $this->iFontColor = $aColor ; + $this->iZFontColor = $aColor ; + } + + function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) { + $this->iFontFamily = $aFontFamily ; + $this->iFontStyle = $aFontStyle ; + $this->iFontSize = $aFontSize ; + $this->SetZFont($aFontFamily,$aFontStyle,$aFontSize); + } + + function SetZFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) { + $this->iZFontFamily = $aFontFamily ; + $this->iZFontStyle = $aFontStyle ; + $this->iZFontSize = $aFontSize ; + } + + function SetZeroLabel($aTxt) { + $this->iLblZeroTxt = $aTxt ; + } + + function SetZFontColor($aColor) { + $this->iZFontColor = $aColor ; + } + + function StrokeLabels($aImg,$xc,$yc,$ri,$rr) { + + if( $this->iHideLabels ) return; + + // Setup some convinient vairables + $a = $this->iAngle * M_PI/180.0; + $n = $this->iNumCirc; + $d = $this->iDelta; + + // Setup the font and font color + $val = new Text(); + $val->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize); + $val->SetColor($this->iFontColor); + + if( $this->iFontBkgColor !== false ) { + $val->SetBox($this->iFontBkgColor,$this->iFontFrameColor); + } + + // Position the labels relative to the radiant circles + if( $this->iLblAlign == LBLALIGN_TOP ) { + if( $a > 0 && $a <= M_PI/2 ) { + $val->SetAlign('left','bottom'); + } + elseif( $a > M_PI/2 && $a <= M_PI ) { + $val->SetAlign('right','bottom'); + } + } + elseif( $this->iLblAlign == LBLALIGN_CENTER ) { + $val->SetAlign('center','center'); + } + + // Stroke the labels close to each circle + $v = $d ; + $si = sin($a); + $co = cos($a); + for( $i=0; $i < $n; ++$i, $v += $d ) { + $r = $ri + ($i+1) * $rr; + $x = $xc + $co * $r; + $y = $yc - $si * $r; + $val->Set(sprintf($this->iLblFmt,$v)); + $val->Stroke($aImg,$x,$y); + } + + // Print the text in the zero circle + if( $this->iLblZeroTxt === null ) { + $this->iLblZeroTxt = sprintf($this->iLblFmt,$this->iZeroSum); + } + else { + $this->iLblZeroTxt = sprintf($this->iLblZeroTxt,$this->iZeroSum); + } + + $val->Set($this->iLblZeroTxt); + $val->SetAlign('center','center'); + $val->SetParagraphAlign('center'); + $val->SetColor($this->iZFontColor); + $val->SetFont($this->iZFontFamily,$this->iZFontStyle,$this->iZFontSize); + $val->Stroke($aImg,$xc,$yc); + } +} + +//=================================================== +// CLASS LegendStyle +//=================================================== +class LegendStyle { + public $iLength = 40, $iMargin = 20 , $iBottomMargin=5; + public $iCircleWeight=2, $iCircleRadius = 18, $iCircleColor='black'; + public $iTxtFontFamily=FF_VERDANA,$iTxtFontStyle=FS_NORMAL,$iTxtFontSize=8; + public $iLblFontFamily=FF_VERDANA,$iLblFontStyle=FS_NORMAL,$iLblFontSize=8; + public $iCircleFontFamily=FF_VERDANA,$iCircleFontStyle=FS_NORMAL,$iCircleFontSize=8; + public $iLblFontColor='black',$iTxtFontColor='black',$iCircleFontColor='black'; + public $iShow=true; + public $iFormatString='%.1f'; + public $iTxtMargin=6, $iTxt=''; + public $iZCircleTxt='Calm'; + + function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) { + $this->iLblFontFamily = $aFontFamily ; + $this->iLblFontStyle = $aFontStyle ; + $this->iLblFontSize = $aFontSize ; + $this->iTxtFontFamily = $aFontFamily ; + $this->iTxtFontStyle = $aFontStyle ; + $this->iTxtFontSize = $aFontSize ; + $this->iCircleFontFamily = $aFontFamily ; + $this->iCircleFontStyle = $aFontStyle ; + $this->iCircleFontSize = $aFontSize ; + } + + function SetLFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) { + $this->iLblFontFamily = $aFontFamily ; + $this->iLblFontStyle = $aFontStyle ; + $this->iLblFontSize = $aFontSize ; + } + + function SetTFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) { + $this->iTxtFontFamily = $aFontFamily ; + $this->iTxtFontStyle = $aFontStyle ; + $this->iTxtFontSize = $aFontSize ; + } + + function SetCFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) { + $this->iCircleFontFamily = $aFontFamily ; + $this->iCircleFontStyle = $aFontStyle ; + $this->iCircleFontSize = $aFontSize ; + } + + + function SetFontColor($aColor) { + $this->iTxtFontColor = $aColor ; + $this->iLblFontColor = $aColor ; + $this->iCircleFontColor = $aColor ; + } + + function SetTFontColor($aColor) { + $this->iTxtFontColor = $aColor ; + } + + function SetLFontColor($aColor) { + $this->iLblFontColor = $aColor ; + } + + function SetCFontColor($aColor) { + $this->iCircleFontColor = $aColor ; + } + + function SetCircleWeight($aWeight) { + $this->iCircleWeight = $aWeight; + } + + function SetCircleRadius($aRadius) { + $this->iCircleRadius = $aRadius; + } + + function SetCircleColor($aColor) { + $this->iCircleColor = $aColor ; + } + + function SetCircleText($aTxt) { + $this->iZCircleTxt = $aTxt; + } + + function SetMargin($aMarg,$aBottomMargin=5) { + $this->iMargin=$aMarg; + $this->iBottomMargin=$aBottomMargin; + } + + function SetLength($aLength) { + $this->iLength = $aLength ; + } + + function Show($aFlg=true) { + $this->iShow = $aFlg; + } + + function Hide($aFlg=true) { + $this->iShow = ! $aFlg; + } + + function SetFormat($aFmt) { + $this->iFormatString=$aFmt; + } + + function SetText($aTxt) { + $this->iTxt = $aTxt ; + } + +} + +define('RANGE_OVERLAPPING',0); +define('RANGE_DISCRETE',1); + +//=================================================== +// CLASS WindrosePlot +//=================================================== +class WindrosePlot { + private $iAntiAlias=true; + private $iData=array(); + public $iX=0.5,$iY=0.5; + public $iSize=0.55; + private $iGridColor1='gray',$iGridColor2='darkgreen'; + private $iRadialColorArray=array(); + private $iRadialWeightArray=array(); + private $iRadialStyleArray=array(); + private $iRanges = array(1,2,3,5,6,10,13.5,99.0); + private $iRangeStyle = RANGE_OVERLAPPING ; + public $iCenterSize=60; + private $iType = WINDROSE_TYPE16; + public $iFontFamily=FF_VERDANA,$iFontStyle=FS_NORMAL,$iFontSize=10; + public $iFontColor='darkgray'; + private $iRadialGridStyle='longdashed'; + private $iAllDirectionLabels = array('E','ENE','NE','NNE','N','NNW','NW','WNW','W','WSW','SW','SSW','S','SSE','SE','ESE'); + private $iStandardDirections = array(); + private $iCircGridWeight=3, $iRadialGridWeight=1; + private $iLabelMargin=12; + private $iLegweights = array(2,4,6,8,10,12,14,16,18,20); + private $iLegColors = array('orange','black','blue','red','green','purple','navy','yellow','brown'); + private $iLabelFormatString='', $iLabels=array(); + private $iLabelPositioning = LBLPOSITION_EDGE; + private $iColor='white'; + private $iShowBox=false, $iBoxColor='black',$iBoxWeight=1,$iBoxStyle='solid'; + private $iOrdinalEncoding=KEYENCODING_ANTICLOCKWISE; + public $legend=null; + + function __construct($aData) { + $this->iData = $aData; + $this->legend = new LegendStyle(); + + // Setup the scale + $this->scale = new WindrosePlotScale($this->iData); + + // default label for free type i agle and a degree sign + $this->iLabelFormatString = '%.1f'.SymChar::Get('degree'); + + $delta = 2*M_PI/16; + for( $i=0, $a=0; $i < 16; ++$i, $a += $delta ) { + $this->iStandardDirections[$this->iAllDirectionLabels[$i]] = $a; + } + } + + // Dummy method to make window plots have the same signature as the + // layout classes since windrose plots are "leaf" classes in the hierarchy + function LayoutSize() { + return 1; + } + + function SetSize($aSize) { + $this->iSize = $aSize; + } + + function SetDataKeyEncoding($aEncoding) { + $this->iOrdinalEncoding = $aEncoding; + } + + function SetColor($aColor) { + $this->iColor = $aColor; + } + + function SetRadialColors($aColors) { + $this->iRadialColorArray = $aColors; + } + + function SetRadialWeights($aWeights) { + $this->iRadialWeightArray = $aWeights; + } + + function SetRadialStyles($aStyles) { + $this->iRadialStyleArray = $aStyles; + } + + function SetBox($aColor='black',$aWeight=1, $aStyle='solid', $aShow=true) { + $this->iShowBox = $aShow ; + $this->iBoxColor = $aColor ; + $this->iBoxWeight = $aWeight ; + $this->iBoxStyle = $aStyle; + } + + function SetLabels($aLabels) { + $this->iLabels = $aLabels ; + } + + function SetLabelMargin($aMarg) { + $this->iLabelMargin = $aMarg ; + } + + function SetLabelFormat($aLblFormat) { + $this->iLabelFormatString = $aLblFormat ; + } + + function SetCompassLabels($aLabels) { + if( count($aLabels) != 16 ) { + JpgraphError::RaiseL(22004); //('Label specification for windrose directions must have 16 values (one for each compass direction).'); + } + $this->iAllDirectionLabels = $aLabels ; + + $delta = 2*M_PI/16; + for( $i=0, $a=0; $i < 16; ++$i, $a += $delta ) { + $this->iStandardDirections[$this->iAllDirectionLabels[$i]] = $a; + } + + } + + function SetCenterSize($aSize) { + $this->iCenterSize = $aSize; + } + // Alias for SetCenterSize + function SetZCircleSize($aSize) { + $this->iCenterSize = $aSize; + } + + function SetFont($aFFam,$aFStyle=FS_NORMAL,$aFSize=10) { + $this->iFontFamily = $aFFam ; + $this->iFontStyle = $aFStyle ; + $this->iFontSize = $aFSize ; + } + + function SetFontColor($aColor) { + $this->iFontColor=$aColor; + } + + function SetGridColor($aColor1,$aColor2) { + $this->iGridColor1 = $aColor1; + $this->iGridColor2 = $aColor2; + } + + function SetGridWeight($aGrid1=1,$aGrid2=2) { + $this->iCircGridWeight = $aGrid1 ; + $this->iRadialGridWeight = $aGrid2 ; + } + + function SetRadialGridStyle($aStyle) { + $aStyle = strtolower($aStyle); + if( !in_array($aStyle,array('solid','dotted','dashed','longdashed')) ) { + JpGraphError::RaiseL(22005); //("Line style for radial lines must be on of ('solid','dotted','dashed','longdashed') "); + } + $this->iRadialGridStyle=$aStyle; + } + + function SetRanges($aRanges) { + $this->iRanges = $aRanges; + } + + function SetRangeStyle($aStyle) { + $this->iRangeStyle = $aStyle; + } + + function SetRangeColors($aLegColors) { + $this->iLegColors = $aLegColors; + } + + function SetRangeWeights($aWeights) { + $n=count($aWeights); + for($i=0; $i< $n; ++$i ) { + $aWeights[$i] = floor($aWeights[$i]/2); + } + $this->iLegweights = $aWeights; + + } + + function SetType($aType) { + if( $aType < WINDROSE_TYPE4 || $aType > WINDROSE_TYPEFREE ) { + JpGraphError::RaiseL(22006); //('Illegal windrose type specified.'); + } + $this->iType = $aType; + } + + // Alias for SetPos() + function SetCenterPos($aX,$aY) { + $this->iX = $aX; + $this->iY = $aY; + } + + function SetPos($aX,$aY) { + $this->iX = $aX; + $this->iY = $aY; + } + + function SetAntiAlias($aFlag) { + $this->iAntiAlias = $aFlag ; + if( ! $aFlag ) + $this->iCircGridWeight = 1; + } + + function _ThickCircle($aImg,$aXC,$aYC,$aRad,$aWeight=2,$aColor) { + + $aImg->SetColor($aColor); + $aRad *= 2 ; + $aImg->Ellipse($aXC,$aYC,$aRad,$aRad); + if( $aWeight > 1 ) { + $aImg->Ellipse($aXC,$aYC,$aRad+1,$aRad+1); + $aImg->Ellipse($aXC,$aYC,$aRad+2,$aRad+2); + if( $aWeight > 2 ) { + $aImg->Ellipse($aXC,$aYC,$aRad+3,$aRad+3); + $aImg->Ellipse($aXC,$aYC,$aRad+3,$aRad+4); + $aImg->Ellipse($aXC,$aYC,$aRad+4,$aRad+3); + } + } + } + + function _StrokeWindLeg($aImg,$xc,$yc,$a,$ri,$r,$weight,$color) { + + // If less than 1 px long then we assume this has been caused by rounding problems + // and should not be stroked + if( $r < 1 ) return; + + $xt = $xc + cos($a)*$ri; + $yt = $yc - sin($a)*$ri; + $xxt = $xc + cos($a)*($ri+$r); + $yyt = $yc - sin($a)*($ri+$r); + + $x1 = $xt - $weight*sin($a); + $y1 = $yt - $weight*cos($a); + $x2 = $xxt - $weight*sin($a); + $y2 = $yyt - $weight*cos($a); + + $x3 = $xxt + $weight*sin($a); + $y3 = $yyt + $weight*cos($a); + $x4 = $xt + $weight*sin($a); + $y4 = $yt + $weight*cos($a); + + $pts = array($x1,$y1,$x2,$y2,$x3,$y3,$x4,$y4); + $aImg->SetColor($color); + $aImg->FilledPolygon($pts); + + } + + function _StrokeLegend($aImg,$x,$y,$scaling=1,$aReturnWidth=false) { + + if( ! $this->legend->iShow ) return 0; + + $nlc = count($this->iLegColors); + $nlw = count($this->iLegweights); + + // Setup font for ranges + $value = new Text(); + $value->SetAlign('center','bottom'); + $value->SetFont($this->legend->iLblFontFamily, + $this->legend->iLblFontStyle, + $this->legend->iLblFontSize*$scaling); + $value->SetColor($this->legend->iLblFontColor); + + // Remember x-center + $xcenter = $x ; + + // Construct format string + $fmt = $this->legend->iFormatString.'-'.$this->legend->iFormatString; + + // Make sure that the length of each range is enough to cover the + // size of the labels + $tst = sprintf($fmt,$this->iRanges[0],$this->iRanges[1]); + $value->Set($tst); + $w = $value->GetWidth($aImg); + $l = round(max($this->legend->iLength * $scaling,$w*1.5)); + + $r = $this->legend->iCircleRadius * $scaling ; + $len = 2*$r + $this->scale->iMaxNum * $l; + + // We are called just to find out the width + if( $aReturnWidth ) return $len; + + $x -= round($len/2); + $x += $r; + + // 4 pixels extra vertical margin since the circle sometimes is +/- 1 pixel of the + // theorethical radius due to imperfection in the GD library + //$y -= round(max($r,$scaling*$this->iLegweights[($this->scale->iMaxNum-1) % $nlw])+4*$scaling); + $y -= ($this->legend->iCircleRadius + 2)*$scaling+$this->legend->iBottomMargin*$scaling; + + // Adjust for bottom text + if( $this->legend->iTxt != '' ) { + // Setup font for text + $value->Set($this->legend->iTxt); + $y -= /*$this->legend->iTxtMargin + */ $value->GetHeight($aImg); + } + + // Stroke 0-circle + $this->_ThickCircle($aImg,$x,$y,$r,$this->legend->iCircleWeight, + $this->legend->iCircleColor); + + // Remember the center of the circe + $xc=$x; $yc=$y; + + $value->SetAlign('center','bottom'); + $x += $r+1; + + // Stroke all used ranges + $txty = $y - + round($this->iLegweights[($this->scale->iMaxNum-1)%$nlw]*$scaling) - 4*$scaling; + if( $this->scale->iMaxNum >= count($this->iRanges) ) { + JpGraphError::RaiseL(22007); //('To few values for the range legend.'); + } + $i=0;$idx=0; + while( $i < $this->scale->iMaxNum ) { + $y1 = $y - round($this->iLegweights[$i % $nlw]*$scaling); + $y2 = $y + round($this->iLegweights[$i % $nlw]*$scaling); + $x2 = $x + $l ; + $aImg->SetColor($this->iLegColors[$i % $nlc]); + $aImg->FilledRectangle($x,$y1,$x2,$y2); + if( $this->iRangeStyle == RANGE_OVERLAPPING ) { + $lbl = sprintf($fmt,$this->iRanges[$idx],$this->iRanges[$idx+1]); + } + else { + $lbl = sprintf($fmt,$this->iRanges[$idx],$this->iRanges[$idx+1]); + ++$idx; + } + $value->Set($lbl); + $value->Stroke($aImg,$x+$l/2,$txty); + $x = $x2; + ++$i;++$idx; + } + + // Setup circle font + $value->SetFont($this->legend->iCircleFontFamily, + $this->legend->iCircleFontStyle, + $this->legend->iCircleFontSize*$scaling); + $value->SetColor($this->legend->iCircleFontColor); + + // Stroke 0-circle text + $value->Set($this->legend->iZCircleTxt); + $value->SetAlign('center','center'); + $value->ParagraphAlign('center'); + $value->Stroke($aImg,$xc,$yc); + + // Setup circle font + $value->SetFont($this->legend->iTxtFontFamily, + $this->legend->iTxtFontStyle, + $this->legend->iTxtFontSize*$scaling); + $value->SetColor($this->legend->iTxtFontColor); + + // Draw the text under the legend + $value->Set($this->legend->iTxt); + $value->SetAlign('center','top'); + $value->SetParagraphAlign('center'); + $value->Stroke($aImg,$xcenter,$y2+$this->legend->iTxtMargin*$scaling); + } + + function SetAutoScaleAngle($aIsRegRose=true) { + + // If the user already has manually set an angle don't + // trye to find a position + if( is_numeric($this->scale->iAngle) ) + return; + + if( $aIsRegRose ) { + + // Create a complete data for all directions + // and translate string directions to ordinal values. + // This will much simplify the logic below + for( $i=0; $i < 16; ++$i ) { + $dtxt = $this->iAllDirectionLabels[$i]; + if( !empty($this->iData[$dtxt]) ) { + $data[$i] = $this->iData[$dtxt]; + } + elseif( !empty($this->iData[strtolower($dtxt)]) ) { + $data[$i] = $this->iData[strtolower($dtxt)]; + } + elseif( !empty($this->iData[$i]) ) { + $data[$i] = $this->iData[$i]; + } + else { + $data[$i] = array(); + } + } + + // Find the leg which has the lowest weighted sum of number of data around it + $c0 = array_sum($data[0]); + $c1 = array_sum($data[1]); + $found = 1; + $min = $c0+$c1*100; // Initialize to a high value + for( $i=1; $i < 15; ++$i ) { + $c2 = array_sum($data[$i+1]); + + // Weight the leg we will use more to give preference + // to a short middle leg even if the 3 way sum is similair + $w = $c0 + 3*$c1 + $c2 ; + if( $w < $min ) { + $min = $w; + $found = $i; + } + $c0 = $c1; + $c1 = $c2; + } + $this->scale->iAngle = $found*22.5; + } + else { + $n = count($this->iData); + foreach( $this->iData as $dir => $leg ) { + if( !is_numeric($dir) ) { + $pos = array_search(strtoupper($dir),$this->iAllDirectionLabels); + if( $pos !== false ) { + $dir = $pos*22.5; + } + } + $data[round($dir)] = $leg; + } + + // Get all the angles for the data and sort it + $keys = array_keys($data); + sort($keys, SORT_NUMERIC); + + $n = count($data); + $found = false; + $max = 0 ; + for( $i=0; $i < 15; ++$i ) { + $try_a = round(22.5*$i); + + if( $try_a > $keys[$n-1] ) break; + + if( in_array($try_a,$keys) ) continue; + + // Find the angle just lower than this + $j=0; + while( $j < $n && $keys[$j] <= $try_a ) ++$j; + if( $j == 0 ) { + $kj = 0; $keys[$n-1]; + $d1 = 0; abs($kj-$try_a); + } + else { + --$j; + $kj = $keys[$j]; + $d1 = abs($kj-$try_a); + } + + // Find the angle just larger than this + $l=$n-1; + while( $l >= 0 && $keys[$l] >= $try_a ) --$l; + if( $l == $n-1) { + $kl = $keys[0]; + $d2 = abs($kl-$try_a); + } + else { + ++$l; + $kl = $keys[$l]; + $d2 = abs($kl-$try_a); + } + + // Weight the distance so that legs with large spread + // gets a better weight + $w = $d1 + $d2; + if( $i == 0 ) { + $w = round(1.4 * $w); + } + $diff = abs($d1 - $d2); + $w *= (360-$diff); + if( $w > $max ) { + $found = $i; + $max = $w; + } + } + + $a = $found*22.5; + + // Some heuristics to have some preferred positions + if( $keys[$n-1] < 25 ) $a = 45; + elseif( $keys[0] > 60 ) $a = 45; + elseif( $keys[0] > 25 && $keys[$n-1] < 340 ) $a = 0; + elseif( $keys[$n-1] < 75 ) $a = 90; + elseif( $keys[$n-1] < 120 ) $a = 135; + elseif( $keys[$n-1] < 160 ) $a = 180; + + $this->scale->iAngle = $a ; + } + } + + function NormAngle($a) { + while( $a > 360 ) { + $a -= 360; + } + return $a; + } + + function SetLabelPosition($aPos) { + $this->iLabelPositioning = $aPos ; + } + + function _StrokeFreeRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri) { + + // Plot radial grid lines and remember the end position + // and the angle for later use when plotting the labels + if( $this->iType != WINDROSE_TYPEFREE ) { + JpGraphError::RaiseL(22008); //('Internal error: Trying to plot free Windrose even though type is not a free windorose'); + } + + // Check if we should auto-position the angle for the + // labels. Basically we try to find a firection with smallest + // (or none) data. + $this->SetAutoScaleAngle(false); + + $nlc = count($this->iLegColors); + $nlw = count($this->iLegweights); + + // Stroke grid lines for directions and remember the + // position for the labels + $txtpos=array(); + $num = count($this->iData); + + $keys = array_keys($this->iData); + + foreach( $this->iData as $dir => $legdata ) { + if( in_array($dir,$this->iAllDirectionLabels,true) === true) { + $a = $this->iStandardDirections[strtoupper($dir)]; + if( in_array($a*180/M_PI,$keys) ) { + JpGraphError::RaiseL(22009,round($a*180/M_PI)); + //('You have specified the same direction twice, once with an angle and once with a compass direction ('.$a*180/M_PI.' degrees.)'); + } + } + elseif( is_numeric($dir) ) { + $this->NormAngle($dir); + + if( $this->iOrdinalEncoding == KEYENCODING_CLOCKWISE ) { + $dir = 360-$dir; + } + + $a = $dir * M_PI/180; + } + else { + JpGraphError::RaiseL(22010);//('Direction must either be a numeric value or one of the 16 compass directions'); + } + + $xxc = round($xc + cos($a)*$ri); + $yyc = round($yc - sin($a)*$ri); + $x = round($xc + cos($a)*$r); + $y = round($yc - sin($a)*$r); + if( empty($this->iRadialColorArray[$dir]) ) { + $dblImg->SetColor($this->iGridColor2); + } + else { + $dblImg->SetColor($this->iRadialColorArray[$dir]); + } + if( empty($this->iRadialWeightArray[$dir]) ) { + $dblImg->SetLineWeight($this->iRadialGridWeight); + } + else { + $dblImg->SetLineWeight($this->iRadialWeightArray[$dir]); + } + if( empty($this->iRadialStyleArray[$dir]) ) { + $dblImg->SetLineStyle($this->iRadialGridStyle); + } + else { + $dblImg->SetLineStyle($this->iRadialStyleArray[$dir]); + } + $dblImg->StyleLine($xxc,$yyc,$x,$y); + $txtpos[] = array($x,$y,$a); + } + $dblImg->SetLineWeight(1); + + // Setup labels + $lr = $scaling * $this->iLabelMargin; + + if( $this->iLabelPositioning == LBLPOSITION_EDGE ) { + $value->SetAlign('left','top'); + } + else { + $value->SetAlign('center','center'); + $value->SetMargin(0); + } + + for($i=0; $i < $num; ++$i ) { + + list($x,$y,$a) = $txtpos[$i]; + + // Determine the label + + $da = $a*180/M_PI; + if( $this->iOrdinalEncoding == KEYENCODING_CLOCKWISE ) { + $da = 360 - $da; + } + + //$da = 360-$da; + + if( !empty($this->iLabels[$keys[$i]]) ) { + $lbl = $this->iLabels[$keys[$i]]; + } + else { + $lbl = sprintf($this->iLabelFormatString,$da); + } + + if( $this->iLabelPositioning == LBLPOSITION_CENTER ) { + $dx = $dy = 0; + } + else { + // LBLPOSIITON_EDGE + if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0; + if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI; + if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1; + if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI); + + if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI; + if( $a<=M_PI/4 ) $dy=(0.5+$a*2/M_PI); + if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1; + if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI); + if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0; + } + + $value->Set($lbl); + $th = $value->GetHeight($dblImg); + $tw = $value->GetWidth($dblImg); + $xt=round($lr*cos($a)+$x) - $dx*$tw; + $yt=round($y-$lr*sin($a)) - $dy*$th; + + $value->Stroke($dblImg,$xt,$yt); + } + + if( __DEBUG ) { + $dblImg->SetColor('red'); + $dblImg->Circle($xc,$yc,$lr+$r); + } + + // Stroke all the legs + reset($this->iData); + $i=0; + foreach($this->iData as $dir => $legdata) { + $legdata = array_slice($legdata,1); + $nn = count($legdata); + + $a = $txtpos[$i][2]; + $rri = $ri/$scaling; + for( $j=0; $j < $nn; ++$j ) { + // We want the non scaled original radius + $legr = $this->scale->RelTranslate($legdata[$j],$r/$scaling,$ri/$scaling) ; + $this->_StrokeWindLeg($dblImg, $xc, $yc, $a, + $rri *$scaling, + $legr *$scaling, + $this->iLegweights[$j % $nlw] * $scaling, + $this->iLegColors[$j % $nlc]); + $rri += $legr; + } + ++$i; + } + } + + // Translate potential string specified compass labels to their + // corresponding index. + function FixupIndexes($aDataArray,$num) { + $ret = array(); + $keys = array_keys($aDataArray); + foreach($aDataArray as $idx => $data) { + if( is_string($idx) ) { + $idx = strtoupper($idx); + $res = array_search($idx,$this->iAllDirectionLabels); + if( $res === false ) { + JpGraphError::RaiseL(22011,$idx); //('Windrose index must be numeric or direction label. You have specified index='.$idx); + } + $idx = $res; + if( $idx % (16 / $num) !== 0 ) { + JpGraphError::RaiseL(22012); //('Windrose radial axis specification contains a direction which is not enabled.'); + } + $idx /= (16/$num) ; + + if( in_array($idx,$keys,1) ) { + JpgraphError::RaiseL(22013,$idx); //('You have specified the look&feel for the same compass direction twice, once with text and once with index (Index='.$idx.')'); + } + } + if( $idx < 0 || $idx > 15 ) { + JpgraphError::RaiseL(22014); //('Index for copmass direction must be between 0 and 15.'); + } + $ret[$idx] = $data; + } + return $ret; + } + + function _StrokeRegularRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri) { + // _StrokeRegularRose($dblImg,$xc,$yc,$r,$ri) + // Plot radial grid lines and remember the end position + // and the angle for later use when plotting the labels + switch( $this->iType ) { + case WINDROSE_TYPE4: + $num = 4; break; + case WINDROSE_TYPE8: + $num = 8; break; + case WINDROSE_TYPE16: + $num = 16; break; + default: + JpGraphError::RaiseL(22015);//('You have specified an undefined Windrose plot type.'); + } + + // Check if we should auto-position the angle for the + // labels. Basically we try to find a firection with smallest + // (or none) data. + $this->SetAutoScaleAngle(true); + + $nlc = count($this->iLegColors); + $nlw = count($this->iLegweights); + + $this->iRadialColorArray = $this->FixupIndexes($this->iRadialColorArray,$num); + $this->iRadialWeightArray = $this->FixupIndexes($this->iRadialWeightArray,$num); + $this->iRadialStyleArray = $this->FixupIndexes($this->iRadialStyleArray,$num); + + $txtpos=array(); + $a = 2*M_PI/$num; + $dblImg->SetColor($this->iGridColor2); + $dblImg->SetLineStyle($this->iRadialGridStyle); + $dblImg->SetLineWeight($this->iRadialGridWeight); + + // Translate any name specified directions to the index + // so we can easily use it in the loop below + for($i=0; $i < $num; ++$i ) { + $xxc = round($xc + cos($a*$i)*$ri); + $yyc = round($yc - sin($a*$i)*$ri); + $x = round($xc + cos($a*$i)*$r); + $y = round($yc - sin($a*$i)*$r); + if( empty($this->iRadialColorArray[$i]) ) { + $dblImg->SetColor($this->iGridColor2); + } + else { + $dblImg->SetColor($this->iRadialColorArray[$i]); + } + if( empty($this->iRadialWeightArray[$i]) ) { + $dblImg->SetLineWeight($this->iRadialGridWeight); + } + else { + $dblImg->SetLineWeight($this->iRadialWeightArray[$i]); + } + if( empty($this->iRadialStyleArray[$i]) ) { + $dblImg->SetLineStyle($this->iRadialGridStyle); + } + else { + $dblImg->SetLineStyle($this->iRadialStyleArray[$i]); + } + + $dblImg->StyleLine($xxc,$yyc,$x,$y); + $txtpos[] = array($x,$y,$a*$i); + } + $dblImg->SetLineWeight(1); + + $lr = $scaling * $this->iLabelMargin; + if( $this->iLabelPositioning == LBLPOSITION_CENTER ) { + $value->SetAlign('center','center'); + } + else { + $value->SetAlign('left','top'); + $value->SetMargin(0); + $lr /= 2 ; + } + + for($i=0; $i < $num; ++$i ) { + list($x,$y,$a) = $txtpos[$i]; + + // Set the position of the label + if( $this->iLabelPositioning == LBLPOSITION_CENTER ) { + $dx = $dy = 0; + } + else { + // LBLPOSIITON_EDGE + if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0; + if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI; + if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1; + if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI); + + if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI; + if( $a<=M_PI/4 ) $dy=(0.5+$a*2/M_PI); + if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1; + if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI); + if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0; + } + + $value->Set($this->iAllDirectionLabels[$i*(16/$num)]); + $th = $value->GetHeight($dblImg); + $tw = $value->GetWidth($dblImg); + $xt=round($lr*cos($a)+$x) - $dx*$tw; + $yt=round($y-$lr*sin($a)) - $dy*$th; + + $value->Stroke($dblImg,$xt,$yt); + } + + if( __DEBUG ) { + $dblImg->SetColor("red"); + $dblImg->Circle($xc,$yc,$lr+$r); + } + + // Stroke all the legs + reset($this->iData); + $keys = array_keys($this->iData); + foreach($this->iData as $idx => $legdata) { + $legdata = array_slice($legdata,1); + $nn = count($legdata); + if( is_string($idx) ) { + $idx = strtoupper($idx); + $idx = array_search($idx,$this->iAllDirectionLabels); + if( $idx === false ) { + JpGraphError::RaiseL(22016);//('Windrose leg index must be numeric or direction label.'); + } + if( $idx % (16 / $num) !== 0 ) { + JpGraphError::RaiseL(22017);//('Windrose data contains a direction which is not enabled. Please adjust what labels are displayed.'); + } + $idx /= (16/$num) ; + + if( in_array($idx,$keys,1) ) { + JpgraphError::RaiseL(22018,$idx);//('You have specified data for the same compass direction twice, once with text and once with index (Index='.$idx.')'); + + } + } + if( $idx < 0 || $idx > 15 ) { + JpgraphError::RaiseL(22019);//('Index for direction must be between 0 and 15. You can\'t specify angles for a Regular Windplot, only index and compass directions.'); + } + $a = $idx * (360 / $num) ; + $a *= M_PI/180.0; + $rri = $ri/$scaling; + for( $j=0; $j < $nn; ++$j ) { + // We want the non scaled original radius + $legr = $this->scale->RelTranslate($legdata[$j], $r/$scaling,$ri/$scaling) ; + $this->_StrokeWindLeg($dblImg, $xc, $yc, $a, + $rri *$scaling, + $legr *$scaling, + $this->iLegweights[$j % $nlw] * $scaling, + $this->iLegColors[$j % $nlc]); + $rri += $legr; + } + } + } + + + function getWidth($aImg) { + + $scaling = 1;//$this->iAntiAlias ? 2 : 1 ; + if( $this->iSize > 0 && $this->iSize < 1 ) { + $this->iSize *= min($aImg->width,$aImg->height); + } + + + $value = new Text(); + $value->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize*$scaling); + $value->SetColor($this->iFontColor); + // Setup extra size around the graph needed so that the labels + // doesn't get cut. For this we need to find the largest label. + // The code below gives a possible a little to large margin. The + // really, really proper way would be to account for what angle + // the label are at + $n = count($this->iLabels); + if( $n > 0 ) { + $maxh=0;$maxw=0; + foreach($this->iLabels as $key => $lbl) { + $value->Set($lbl); + $maxw = max($maxw,$value->GetWidth($aImg)); + } + } + else { + $value->Set('888.888'); // Dummy value to get width/height + $maxw = $value->GetWidth($aImg); + } + // Add an extra margin of 50% the font size + $maxw += round($this->iFontSize*$scaling * 0.4) ; + + $valxmarg = 1.5*$maxw+2*$this->iLabelMargin*$scaling; + $w = round($this->iSize*$scaling + $valxmarg); + + // Make sure that the width of the legend fits + $legendwidth = $this->_StrokeLegend($aImg,0,0,$scaling,true)+10*$scaling; + $w = max($w,$legendwidth); + + return $w; + } + + function getHeight($aImg) { + + $scaling = 1;//$this->iAntiAlias ? 2 : 1 ; + if( $this->iSize > 0 && $this->iSize < 1 ) { + $this->iSize *= min($aImg->width,$aImg->height); + } + + $value = new Text(); + $value->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize*$scaling); + $value->SetColor($this->iFontColor); + // Setup extra size around the graph needed so that the labels + // doesn't get cut. For this we need to find the largest label. + // The code below gives a possible a little to large margin. The + // really, really proper way would be to account for what angle + // the label are at + $n = count($this->iLabels); + if( $n > 0 ) { + $maxh=0;$maxw=0; + foreach($this->iLabels as $key => $lbl) { + $value->Set($lbl); + $maxh = max($maxh,$value->GetHeight($aImg)); + } + } + else { + $value->Set('180.8'); // Dummy value to get width/height + $maxh = $value->GetHeight($aImg); + } + // Add an extra margin of 50% the font size + //$maxh += round($this->iFontSize*$scaling * 0.5) ; + $valymarg = 2*$maxh+2*$this->iLabelMargin*$scaling; + + $legendheight = round($this->legend->iShow ? 1 : 0); + $legendheight *= max($this->legend->iCircleRadius*2,$this->legend->iTxtFontSize*2)+ + $this->legend->iMargin + $this->legend->iBottomMargin + 2; + $legendheight *= $scaling; + $h = round($this->iSize*$scaling + $valymarg) + $legendheight ; + + return $h; + } + + function Stroke($aGraph) { + + $aImg = $aGraph->img; + + if( $this->iX > 0 && $this->iX < 1 ) { + $this->iX = round( $aImg->width * $this->iX ) ; + } + + if( $this->iY > 0 && $this->iY < 1 ) { + $this->iY = round( $aImg->height * $this->iY ) ; + } + + if( $this->iSize > 0 && $this->iSize < 1 ) { + $this->iSize *= min($aImg->width,$aImg->height); + } + + if( $this->iCenterSize > 0 && $this->iCenterSize < 1 ) { + $this->iCenterSize *= $this->iSize; + } + + $this->scale->AutoScale(($this->iSize - $this->iCenterSize)/2, round(2.5*$this->scale->iFontSize)); + + $scaling = $this->iAntiAlias ? 2 : 1 ; + + $value = new Text(); + $value->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize*$scaling); + $value->SetColor($this->iFontColor); + + $legendheight = round($this->legend->iShow ? 1 : 0); + $legendheight *= max($this->legend->iCircleRadius*2,$this->legend->iTxtFontSize*2)+ + $this->legend->iMargin + $this->legend->iBottomMargin + 2; + $legendheight *= $scaling; + + $w = $scaling*$this->getWidth($aImg); + $h = $scaling*$this->getHeight($aImg); + + // Copy back the double buffered image to the proper canvas + $ww = $w / $scaling ; + $hh = $h / $scaling ; + + // Create the double buffer + if( $this->iAntiAlias ) { + $dblImg = new RotImage($w,$h); + // Set the background color + $dblImg->SetColor($this->iColor); + $dblImg->FilledRectangle(0,0,$w,$h); + } + else { + $dblImg = $aImg ; + // Make sure the ix and it coordinates correpond to the new top left center + $dblImg->SetTranslation($this->iX-$w/2, $this->iY-$h/2); + } + + if( __DEBUG ) { + $dblImg->SetColor('red'); + $dblImg->Rectangle(0,0,$w-1,$h-1); + } + + $dblImg->SetColor('black'); + + if( $this->iShowBox ) { + $dblImg->SetColor($this->iBoxColor); + $old = $dblImg->SetLineWeight($this->iBoxWeight); + $dblImg->SetLineStyle($this->iBoxStyle); + $dblImg->Rectangle(0,0,$w-1,$h-1); + $dblImg->SetLineWeight($old); + } + + $xc = round($w/2); + $yc = round(($h-$legendheight)/2); + + if( __DEBUG ) { + $dblImg->SetColor('red'); + $old = $dblImg->SetLineWeight(2); + $dblImg->Line($xc-5,$yc-5,$xc+5,$yc+5); + $dblImg->Line($xc+5,$yc-5,$xc-5,$yc+5); + $dblImg->SetLineWeight($old); + } + + $this->iSize *= $scaling; + + // Inner circle size + $ri = $this->iCenterSize/2 ; + + // Full circle radius + $r = round( $this->iSize/2 ); + + // Get number of grid circles + $n = $this->scale->GetNumCirc(); + + // Plot circle grids + $ri *= $scaling ; + $rr = round(($r-$ri)/$n); + for( $i = 1; $i <= $n; ++$i ) { + $this->_ThickCircle($dblImg,$xc,$yc,$rr*$i+$ri, + $this->iCircGridWeight,$this->iGridColor1); + } + + $num = 0 ; + + if( $this->iType == WINDROSE_TYPEFREE ) { + $this->_StrokeFreeRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri); + } + else { + // Check if we need to re-code the interpretation of the ordinal + // number in the data. Internally ordinal value 0 is East and then + // counted anti-clockwise. The user might choose an encoding + // that have 0 being the first axis to the right of the "N" axis and then + // counted clock-wise + if( $this->iOrdinalEncoding == KEYENCODING_CLOCKWISE ) { + if( $this->iType == WINDROSE_TYPE16 ) { + $const1 = 19; $const2 = 16; + } + elseif( $this->iType == WINDROSE_TYPE8 ) { + $const1 = 9; $const2 = 8; + } + else { + $const1 = 4; $const2 = 4; + } + $tmp = array(); + $n=count($this->iData); + foreach( $this->iData as $key => $val ) { + if( is_numeric($key) ) { + $key = ($const1 - $key) % $const2 ; + } + $tmp[$key] = $val; + } + $this->iData = $tmp; + } + $this->_StrokeRegularRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri); + } + + // Stroke the labels + $this->scale->iFontSize *= $scaling; + $this->scale->iZFontSize *= $scaling; + $this->scale->StrokeLabels($dblImg,$xc,$yc,$ri,$rr); + + // Stroke the inner circle again since the legs + // might have written over it + $this->_ThickCircle($dblImg,$xc,$yc,$ri,$this->iCircGridWeight,$this->iGridColor1); + + if( $ww > $aImg->width ) { + JpgraphError::RaiseL(22020); + //('Windrose plot is too large to fit the specified Graph size. Please use WindrosePlot::SetSize() to make the plot smaller or increase the size of the Graph in the initial WindroseGraph() call.'); + } + + $x = $xc; + $y = $h; + $this->_StrokeLegend($dblImg,$x,$y,$scaling); + + if( $this->iAntiAlias ) { + $aImg->Copy($dblImg->img, $this->iX-$ww/2, $this->iY-$hh/2, 0, 0, $ww,$hh, $w,$h); + } + + // We need to restore the translation matrix + $aImg->SetTranslation(0,0); + + } + +} + +//============================================================ +// CLASS WindroseGraph +//============================================================ +class WindroseGraph extends Graph { + private $posx, $posy; + public $plots=array(); + + function __construct($width=300,$height=200,$cachedName="",$timeout=0,$inline=1) { + parent::__construct($width,$height,$cachedName,$timeout,$inline); + $this->posx=$width/2; + $this->posy=$height/2; + $this->SetColor('white'); + $this->title->SetFont(FF_VERDANA,FS_NORMAL,12); + $this->title->SetMargin(8); + $this->subtitle->SetFont(FF_VERDANA,FS_NORMAL,10); + $this->subtitle->SetMargin(0); + $this->subsubtitle->SetFont(FF_VERDANA,FS_NORMAL,8); + $this->subsubtitle->SetMargin(0); + } + + function StrokeTexts() { + if( $this->texts != null ) { + $n = count($this->texts); + for($i=0; $i < $n; ++$i ) { + $this->texts[$i]->Stroke($this->img); + } + } + } + + function StrokeIcons() { + if( $this->iIcons != null ) { + $n = count($this->iIcons); + for( $i=0; $i < $n; ++$i ) { + // Since Windrose graphs doesn't have any linear scale the position of + // each icon has to be given as absolute coordinates + $this->iIcons[$i]->_Stroke($this->img); + } + } + } + + //--------------- + // PUBLIC METHODS + function Add($aObj) { + if( is_array($aObj) && count($aObj) > 0 ) { + $cl = $aObj[0]; + } + else { + $cl = $aObj; + } + if( $cl instanceof Text ) { + $this->AddText($aObj); + } + elseif( $cl instanceof IconPlot ) { + $this->AddIcon($aObj); + } + elseif( ($cl instanceof WindrosePlot) || ($cl instanceof LayoutRect) || ($cl instanceof LayoutHor)) { + $this->plots[] = $aObj; + } + else { + JpgraphError::RaiseL(22021); + } + } + + function AddText($aTxt,$aToY2=false) { + parent::AddText($aTxt); + } + + function SetColor($c) { + $this->SetMarginColor($c); + } + + // Method description + function Stroke($aStrokeFileName="") { + + // If the filename is the predefined value = '_csim_special_' + // we assume that the call to stroke only needs to do enough + // to correctly generate the CSIM maps. + // We use this variable to skip things we don't strictly need + // to do to generate the image map to improve performance + // as best we can. Therefore you will see a lot of tests !$_csim in the + // code below. + $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE); + + // We need to know if we have stroked the plot in the + // GetCSIMareas. Otherwise the CSIM hasn't been generated + // and in the case of GetCSIM called before stroke to generate + // CSIM without storing an image to disk GetCSIM must call Stroke. + $this->iHasStroked = true; + + if( $this->background_image != "" || $this->background_cflag != "" ) { + $this->StrokeFrameBackground(); + } + else { + $this->StrokeFrame(); + } + + // n holds number of plots + $n = count($this->plots); + for($i=0; $i < $n ; ++$i) { + $this->plots[$i]->Stroke($this); + } + + $this->footer->Stroke($this->img); + $this->StrokeIcons(); + $this->StrokeTexts(); + $this->StrokeTitles(); + + // If the filename is given as the special "__handle" + // then the image handler is returned and the image is NOT + // streamed back + if( $aStrokeFileName == _IMG_HANDLER ) { + return $this->img->img; + } + else { + // Finally stream the generated picture + $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline, + $aStrokeFileName); + } + } + +} // Class + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/lang/de.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/lang/de.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/lang/de.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/lang/de.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -186,7 +186,8 @@ 15008 => array('PiePlot::SetLabelType() der Typ für Tortendiagramme muss entweder 0 or 1 sein (nicht %d).',1), 15009 => array('Ungültiges Tortendiagramm. Die Summe aller Daten ist Null.',0), 15010 => array('Die Summe aller Daten ist Null.',0), -15011 => array('Um Bildtransformationen benutzen zu können, muss die Datei jpgraph_imgtrans.php eingefügt werden (per include).',0), +15011 => array('Um Bildtransformationen benutzen zu können, muss die Datei jpgraph_imgtrans.php eingefügt werden (per include).',0), // @todo translate into German +15012 => array('PiePlot::SetTheme() is no longer recommended. Use PieGraph::SetTheme()',0), /* ** jpgraph_plotband @@ -405,6 +406,8 @@ 25130 => array('Too small plot area. (%d x %d). With the given image size and margins there is to little space left for the plot. Increase the plot size or reduce the margins.',2), 25131 => array('StrokeBoxedText2() only supports TTF fonts and not built-in bitmap fonts.',0), +25132 => array('Undefined property %s.',1), // @todo translate +25133 => array('Use Graph::SetTheme() after Graph::SetScale().',0), // @todo translate /* ** jpgraph_led @@ -537,6 +540,13 @@ 29209 => array('CSIM Target matrix must be the same size as the data matrix (csim=%d x %d, data=%d x %d)',4), 29210 => array('CSIM Target for matrix labels does not match the number of labels (csim=%d, labels=%d)',2), + +/* +* jpgraph_theme +*/ +30001 => array("Theme::%s() is not defined. \nPlease make %s(\$graph) function in your theme classs.",2), + + ); ?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/lang/en.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/lang/en.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/lang/en.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/lang/en.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -5,7 +5,7 @@ // Created: 2006-01-25 // Ver: $Id: en.inc.php 1886 2009-10-01 23:30:16Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -187,6 +187,7 @@ 15009 => array('Illegal pie plot. Sum of all data is zero for Pie Plot',0), 15010 => array('Sum of all data is 0 for Pie.',0), 15011 => array('In order to use image transformation you must include the file jpgraph_imgtrans.php in your script.',0), +15012 => array('PiePlot::SetTheme() is no longer supported. Use PieGraph::SetTheme()',0), /* ** jpgraph_plotband @@ -404,6 +405,8 @@ 25130 => array('Too small plot area. (%d x %d). With the given image size and margins there is to little space left for the plot. Increase the plot size or reduce the margins.',2), 25131 => array('StrokeBoxedText2() only supports TTF fonts and not built-in bitmap fonts.',0), +25132 => array('Undefined property %s.',1), +25133 => array('Use Graph::SetTheme() after Graph::SetScale().',0), /* ** jpgraph_led @@ -531,6 +534,12 @@ 29209 => array('CSIM Target matrix must be the same size as the data matrix (csim=%d x %d, data=%d x %d)',4), 29210 => array('CSIM Target for matrix labels does not match the number of labels (csim=%d, labels=%d)',2), + +/* +* jpgraph_theme +*/ +30001 => array("Theme::%s() is not defined. \nPlease make %s(\$graph) function in your theme classs.",2), + ); ?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/lang/prod.inc.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/lang/prod.inc.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/lang/prod.inc.php 1970-01-01 10:13:08.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/lang/prod.inc.php 2020-05-26 05:18:30.000000000 +0100 @@ -6,7 +6,7 @@ // Created: 2006-02-18 // Ver: $Id: prod.inc.php 1886 2009-10-01 23:30:16Z ljp $ // -// Copyright (c) Aditus Consulting. All rights reserved. +// Copyright (c) Asial Corporation. All rights reserved. //======================================================================== */ @@ -120,6 +120,7 @@ 15009 => array(DEFAULT_ERROR_MESSAGE.'15009',0), 15010 => array(DEFAULT_ERROR_MESSAGE.'15010',0), 15011 => array(DEFAULT_ERROR_MESSAGE.'15011',0), +15012 => array(DEFAULT_ERROR_MESSAGE.'15012',0), 16001 => array(DEFAULT_ERROR_MESSAGE.'16001',0), 16002 => array(DEFAULT_ERROR_MESSAGE.'16002',0), 16003 => array(DEFAULT_ERROR_MESSAGE.'16003',0), @@ -279,6 +280,8 @@ 25129 => array(DEFAULT_ERROR_MESSAGE.'25129',0), 25130 => array(DEFAULT_ERROR_MESSAGE.'25130',0), 25131 => array(DEFAULT_ERROR_MESSAGE.'25131',0), +25132 => array(DEFAULT_ERROR_MESSAGE.'25132',0), +25133 => array(DEFAULT_ERROR_MESSAGE.'25133',0), 25500 => array(DEFAULT_ERROR_MESSAGE.'25500',0), 24003 => array(DEFAULT_ERROR_MESSAGE.'24003',0), 24004 => array(DEFAULT_ERROR_MESSAGE.'24004',0), diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/README smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/README --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/README 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/README 2020-11-11 01:57:45.000000000 +0000 @@ -0,0 +1,63 @@ +README FOR JPGRAPH 4.3.4 +========================= + +This package contains the JpGraph PHP library version 4.3.4 + +The library is Copyright (C) 2000-2010 Asial Corporatoin and +released under dual license QPL 1.0 for open source and educational +use and JpGraph Professional License for commercial use. + +Please see full license details at +http://jpgraph.net/pro/ +http://jpgraph.net/download/ + + +Requirements: +------------- +Miminum: +* PHP 5.1.0 or higher +* GD 2.0.28 or higher +Note: Earlier versions might work but is unsupported. + +Recommended: +* >= PHP 5.2.0 +* PHP Builtin GD library + +Installation +------------ +1. Make sure that the PHP version is compatible with the stated + requirements and that the PHP installation has support for + the GD library. Please run phpinfo() to check if GD library + is supported in the installation. + If the GD library doesn't seem to be installed + please consult the PHP manual under section "Image" for + instructions on where to find this library. Please refer to + the manual section "Verifying your PHP installation" + +2. Unzip and copy the files to a directory of your choice where Your + httpd sever can access them. + For a global site installation you should copy the files to + somewhere in the PHP search path. + +3. Check that the default directory paths in jpg-config.inc.php + for cache directory and TTF directory suits your installation. + Note1: The default directories are different depending on if + the library is running on Windows or UNIX. + Note2: Apache/PHP must have write permission to your cache + directory if you enable the cache feature. By default the cache + is disabled. + + +Documentation +------------- +The installation includes HTML documentation and reference guide for the +library. The portal page for all documentation is +/docs/index.html + + +Bug reports and suggestions +--------------------------- +Should be reported using the contact form at + +http://jpgraph.net/contact/ + diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/AquaTheme.class.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/AquaTheme.class.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/AquaTheme.class.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/AquaTheme.class.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,201 @@ +img; + $height = $img->height; + $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25); + */ + $graph->SetFrame(false); + $graph->SetMarginColor('white'); + $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT); + + // legend + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetFillColor('white'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // xaxis + $graph->xaxis->title->SetColor($this->font_color); + $graph->xaxis->SetColor($this->axis_color, $this->font_color); + $graph->xaxis->SetTickSide(SIDE_BOTTOM); + $graph->xaxis->SetLabelMargin(10); + + // yaxis + $graph->yaxis->title->SetColor($this->font_color); + $graph->yaxis->SetColor($this->axis_color, $this->font_color); + $graph->yaxis->SetTickSide(SIDE_LEFT); + $graph->yaxis->SetLabelMargin(8); + $graph->yaxis->HideLine(); + $graph->yaxis->HideTicks(); + $graph->xaxis->SetTitleMargin(15); + + // grid + $graph->ygrid->SetColor($this->grid_color); + $graph->ygrid->SetLineStyle('dotted'); + + + // font + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + +// $graph->img->SetAntiAliasing(); + } + + + function SetupPieGraph($graph) { + + // graph + $graph->SetFrame(false); + + // legend + $graph->legend->SetFillColor('white'); + + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.80, 'center', 'top'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(4); + + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // title + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + + $graph->SetAntiAliasing(); + } + + + function PreStrokeApply($graph) { + if ($graph->legend->HasItems()) { + $img = $graph->img; + $graph->SetMargin( + $img->raw_left_margin, + $img->raw_right_margin, + $img->raw_top_margin, + is_numeric($img->raw_bottom_margin) ? $img->raw_bottom_margin : $img->height * 0.25 + ); + } + } + + function ApplyPlot($plot) { + + switch (get_class($plot)) + { + case 'GroupBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'AccBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'BarPlot': + { + $plot->Clear(); + + $color = $this->GetNextColor(); + $plot->SetColor($color); + $plot->SetFillColor($color); + //$plot->SetShadow(); + break; + } + + case 'LinePlot': + { + $plot->Clear(); + $plot->SetColor($this->GetNextColor()); + $plot->SetWeight(2); +// $plot->SetBarCenter(); + break; + } + + case 'PiePlot': + { + $plot->SetCenter(0.5, 0.45); + $plot->ShowBorder(false); + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + case 'PiePlot3D': + { + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + default: + { + } + } + } +} + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/GreenTheme.class.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/GreenTheme.class.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/GreenTheme.class.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/GreenTheme.class.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,182 @@ +img; + $height = $img->height; + $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25); + */ + $graph->SetFrame(false); + $graph->SetMarginColor('white'); + $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT); + + // legend + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetFillColor('white'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // xaxis + $graph->xaxis->title->SetColor($this->font_color); + $graph->xaxis->SetColor($this->axis_color, $this->font_color); + $graph->xaxis->SetTickSide(SIDE_BOTTOM); + $graph->xaxis->SetLabelMargin(10); + + // yaxis + $graph->yaxis->title->SetColor($this->font_color); + $graph->yaxis->SetColor($this->axis_color, $this->font_color); + $graph->yaxis->SetTickSide(SIDE_LEFT); + $graph->yaxis->SetLabelMargin(8); + $graph->yaxis->HideLine(); + $graph->yaxis->HideTicks(); + $graph->xaxis->SetTitleMargin(15); + + // grid + $graph->ygrid->SetColor($this->grid_color); + $graph->ygrid->SetLineStyle('dotted'); + + + // font + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + +// $graph->img->SetAntiAliasing(); + } + + + function SetupPieGraph($graph) { + + // graph + $graph->SetFrame(false); + + // legend + $graph->legend->SetFillColor('white'); + /* + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + */ + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // title + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + + $graph->SetAntiAliasing(); + } + + + function PreStrokeApply($graph) { + if ($graph->legend->HasItems()) { + $img = $graph->img; + $graph->SetMargin( + $img->raw_left_margin, + $img->raw_right_margin, + $img->raw_top_margin, + is_numeric($img->raw_bottom_margin) ? $img->raw_bottom_margin : $img->height * 0.25 + ); + } + } + + function ApplyPlot($plot) { + + switch (get_class($plot)) + { + case 'GroupBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'AccBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'BarPlot': + { + $plot->Clear(); + + $color = $this->GetNextColor(); + $plot->SetColor($color); + $plot->SetFillColor($color); + $plot->SetShadow('red', 3, 4, false); + break; + } + + case 'LinePlot': + { + $plot->Clear(); + + $plot->SetColor($this->GetNextColor().'@0.4'); + $plot->SetWeight(2); + break; + } + + case 'PiePlot': + { + $plot->ShowBorder(false); + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + case 'PiePlot3D': + { + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + default: + { + } + } + } +} + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/OceanTheme.class.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/OceanTheme.class.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/OceanTheme.class.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/OceanTheme.class.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,184 @@ +img; + $height = $img->height; + $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25); + */ + $graph->SetFrame(false); + $graph->SetMarginColor('white'); + $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT); + + // legend + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetFillColor('white'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // xaxis + $graph->xaxis->title->SetColor($this->font_color); + $graph->xaxis->SetColor($this->axis_color, $this->font_color); + $graph->xaxis->SetTickSide(SIDE_BOTTOM); + $graph->xaxis->SetLabelMargin(10); + + // yaxis + $graph->yaxis->title->SetColor($this->font_color); + $graph->yaxis->SetColor($this->axis_color, $this->font_color); + $graph->yaxis->SetTickSide(SIDE_LEFT); + $graph->yaxis->SetLabelMargin(8); + $graph->yaxis->HideLine(); + $graph->yaxis->HideTicks(); + $graph->xaxis->SetTitleMargin(15); + + // grid + $graph->ygrid->SetColor($this->grid_color); + $graph->ygrid->SetLineStyle('dotted'); + + + // font + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + +// $graph->img->SetAntiAliasing(); + } + + + function SetupPieGraph($graph) { + + // graph + $graph->SetFrame(false); + + // legend + $graph->legend->SetFillColor('white'); + /* + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + */ + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // title + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + + $graph->SetAntiAliasing(); + } + + + function PreStrokeApply($graph) { + if ($graph->legend->HasItems()) { + $img = $graph->img; + $graph->SetMargin( + $img->raw_left_margin, + $img->raw_right_margin, + $img->raw_top_margin, + is_numeric($img->raw_bottom_margin) ? $img->raw_bottom_margin : $img->height * 0.25 + ); + } + } + + function ApplyPlot($plot) { + + switch (get_class($plot)) + { + case 'GroupBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'AccBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'BarPlot': + { + $plot->Clear(); + + $color = $this->GetNextColor(); + $plot->SetColor($color); + $plot->SetFillColor($color); + $plot->SetShadow('red', 3, 4, false); + break; + } + + case 'LinePlot': + { + $plot->Clear(); + + $plot->SetColor($this->GetNextColor()); + $plot->SetWeight(2); + break; + } + + case 'PiePlot': + { + $plot->ShowBorder(false); + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + case 'PiePlot3D': + { + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + default: + { + } + } + } +} + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/OrangeTheme.class.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/OrangeTheme.class.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/OrangeTheme.class.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/OrangeTheme.class.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,184 @@ +img; + $height = $img->height; + $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25); + */ + $graph->SetFrame(false); + $graph->SetMarginColor('white'); + $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT); + + // legend + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetFillColor('white'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // xaxis + $graph->xaxis->title->SetColor($this->font_color); + $graph->xaxis->SetColor($this->axis_color, $this->font_color); + $graph->xaxis->SetTickSide(SIDE_BOTTOM); + $graph->xaxis->SetLabelMargin(10); + + // yaxis + $graph->yaxis->title->SetColor($this->font_color); + $graph->yaxis->SetColor($this->axis_color, $this->font_color); + $graph->yaxis->SetTickSide(SIDE_LEFT); + $graph->yaxis->SetLabelMargin(8); + $graph->yaxis->HideLine(); + $graph->yaxis->HideTicks(); + $graph->xaxis->SetTitleMargin(15); + + // grid + $graph->ygrid->SetColor($this->grid_color); + $graph->ygrid->SetLineStyle('dotted'); + + + // font + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + +// $graph->img->SetAntiAliasing(); + } + + + function SetupPieGraph($graph) { + + // graph + $graph->SetFrame(false); + + // legend + $graph->legend->SetFillColor('white'); + /* + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + */ + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // title + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + + $graph->SetAntiAliasing(); + } + + + function PreStrokeApply($graph) { + if ($graph->legend->HasItems()) { + $img = $graph->img; + $graph->SetMargin( + $img->raw_left_margin, + $img->raw_right_margin, + $img->raw_top_margin, + is_numeric($img->raw_bottom_margin) ? $img->raw_bottom_margin : $img->height * 0.25 + ); + } + } + + function ApplyPlot($plot) { + + switch (get_class($plot)) + { + case 'GroupBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'AccBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'BarPlot': + { + $plot->Clear(); + + $color = $this->GetNextColor(); + $plot->SetColor($color); + $plot->SetFillColor($color); + $plot->SetShadow('red', 3, 4, false); + break; + } + + case 'LinePlot': + { + $plot->Clear(); + + $plot->SetColor($this->GetNextColor().'@0.4'); + $plot->SetWeight(2); + break; + } + + case 'PiePlot': + { + $plot->ShowBorder(false); + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + case 'PiePlot3D': + { + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + default: + { + } + } + } +} + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/PastelTheme.class.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/PastelTheme.class.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/PastelTheme.class.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/PastelTheme.class.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,179 @@ +img; + $height = $img->height; + $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25); + */ + $graph->SetFrame(false); + $graph->SetMarginColor('white'); + $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT); + + // legend + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetFillColor('white'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // xaxis + $graph->xaxis->title->SetColor($this->font_color); + $graph->xaxis->SetColor($this->axis_color, $this->font_color); + $graph->xaxis->SetTickSide(SIDE_BOTTOM); + $graph->xaxis->SetLabelMargin(10); + + // yaxis + $graph->yaxis->title->SetColor($this->font_color); + $graph->yaxis->SetColor($this->axis_color, $this->font_color); + $graph->yaxis->SetTickSide(SIDE_LEFT); + $graph->yaxis->SetLabelMargin(8); + $graph->yaxis->HideLine(); + $graph->yaxis->HideTicks(); + $graph->xaxis->SetTitleMargin(15); + + // grid + $graph->ygrid->SetColor($this->grid_color); + $graph->ygrid->SetLineStyle('dotted'); + + + // font + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + +// $graph->img->SetAntiAliasing(); + } + + + function SetupPieGraph($graph) { + + // graph + $graph->SetFrame(false); + + // legend + $graph->legend->SetFillColor('white'); + + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.80, 'center', 'top'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(4); + + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // title + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + + $graph->SetAntiAliasing(); + } + + + function PreStrokeApply($graph) { + if ($graph->legend->HasItems()) { + $img = $graph->img; + $graph->SetMargin( + $img->raw_left_margin, + $img->raw_right_margin, + $img->raw_top_margin, + is_numeric($img->raw_bottom_margin) ? $img->raw_bottom_margin : $img->height * 0.25 + ); + } + } + + function ApplyPlot($plot) { + + switch (get_class($plot)) + { + case 'GroupBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'AccBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'BarPlot': + { + $plot->Clear(); + + $color = $this->GetNextColor(); + $plot->SetColor($color); + $plot->SetFillColor($color); + $plot->SetShadow('red', 3, 4, false); + break; + } + + case 'LinePlot': + { + $plot->Clear(); + $plot->SetColor($this->GetNextColor().'@0.4'); + $plot->SetWeight(2); +// $plot->SetBarCenter(); + break; + } + + case 'PiePlot': + { + $plot->SetCenter(0.5, 0.45); + $plot->ShowBorder(false); + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + case 'PiePlot3D': + { + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + default: + { + } + } + } +} + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/RoseTheme.class.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/RoseTheme.class.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/RoseTheme.class.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/RoseTheme.class.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,184 @@ +img; + $height = $img->height; + $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25); + */ + $graph->SetFrame(false); + $graph->SetMarginColor('white'); + $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT); + + // legend + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetFillColor('white'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // xaxis + $graph->xaxis->title->SetColor($this->font_color); + $graph->xaxis->SetColor($this->axis_color, $this->font_color); + $graph->xaxis->SetTickSide(SIDE_BOTTOM); + $graph->xaxis->SetLabelMargin(10); + + // yaxis + $graph->yaxis->title->SetColor($this->font_color); + $graph->yaxis->SetColor($this->axis_color, $this->font_color); + $graph->yaxis->SetTickSide(SIDE_LEFT); + $graph->yaxis->SetLabelMargin(8); + $graph->yaxis->HideLine(); + $graph->yaxis->HideTicks(); + $graph->xaxis->SetTitleMargin(15); + + // grid + $graph->ygrid->SetColor($this->grid_color); + $graph->ygrid->SetLineStyle('dotted'); + + + // font + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + +// $graph->img->SetAntiAliasing(); + } + + + function SetupPieGraph($graph) { + + // graph + $graph->SetFrame(false); + + // legend + $graph->legend->SetFillColor('white'); + /* + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + */ + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // title + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + + $graph->SetAntiAliasing(); + } + + + function PreStrokeApply($graph) { + if ($graph->legend->HasItems()) { + $img = $graph->img; + $graph->SetMargin( + $img->raw_left_margin, + $img->raw_right_margin, + $img->raw_top_margin, + is_numeric($img->raw_bottom_margin) ? $img->raw_bottom_margin : $img->height * 0.25 + ); + } + } + + function ApplyPlot($plot) { + + switch (get_class($plot)) + { + case 'GroupBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'AccBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'BarPlot': + { + $plot->Clear(); + + $color = $this->GetNextColor(); + $plot->SetColor($color); + $plot->SetFillColor($color); + $plot->SetShadow('red', 3, 4, false); + break; + } + + case 'LinePlot': + { + $plot->Clear(); + + $plot->SetColor($this->GetNextColor().'@0.4'); + $plot->SetWeight(2); + break; + } + + case 'PiePlot': + { + $plot->ShowBorder(false); + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + case 'PiePlot3D': + { + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + default: + { + } + } + } +} + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/SoftyTheme.class.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/SoftyTheme.class.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/SoftyTheme.class.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/SoftyTheme.class.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,213 @@ +SetFrame(false); + $graph->SetMarginColor('white'); + + // legend + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetFillColor('white'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // xaxis + $graph->xaxis->title->SetColor($this->font_color); + $graph->xaxis->SetColor($this->axis_color, $this->font_color); + $graph->xaxis->SetTickSide(SIDE_BOTTOM); + $graph->xaxis->SetLabelMargin(10); + + // yaxis + $graph->yaxis->title->SetColor($this->font_color); + $graph->yaxis->SetColor($this->axis_color, $this->font_color); + $graph->yaxis->SetTickSide(SIDE_LEFT); + $graph->yaxis->SetLabelMargin(8); + $graph->yaxis->HideLine(); + $graph->yaxis->HideTicks(); + $graph->xaxis->SetTitleMargin(15); + + // y2~ + if (isset($graph->y2axis)) { + $graph->y2axis->title->SetColor($this->font_color); + $graph->y2axis->SetColor($this->axis_color, $this->font_color); + $graph->y2axis->SetTickSide(SIDE_LEFT); + $graph->y2axis->SetLabelMargin(8); + $graph->y2axis->HideLine(); + $graph->y2axis->HideTicks(); + } + + // yn + if (isset($graph->y2axis)) { + foreach ($graph->ynaxis as $axis) { + $axis->title->SetColor($this->font_color); + $axis->SetColor($this->axis_color, $this->font_color); + $axis->SetTickSide(SIDE_LEFT); + $axis->SetLabelMargin(8); + $axis->HideLine(); + $axis->HideTicks(); + } + } + + // grid + $graph->ygrid->SetColor($this->grid_color); + $graph->ygrid->SetLineStyle('dotted'); + $graph->ygrid->SetFill(true, '#FFFFFF', $this->background_color); + $graph->xgrid->Show(); + $graph->xgrid->SetColor($this->grid_color); + $graph->xgrid->SetLineStyle('dotted'); + + + // font + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + +// $graph->img->SetAntiAliasing(); + } + + + function SetupPieGraph($graph) { + + // graph + $graph->SetFrame(false); + + // title + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + + $graph->SetAntiAliasing(); + } + + + function PreStrokeApply($graph) { + if ($graph->legend->HasItems()) { + $img = $graph->img; + $graph->SetMargin( + $img->raw_left_margin, + $img->raw_right_margin, + $img->raw_top_margin, + is_numeric($img->raw_bottom_margin) ? $img->raw_bottom_margin : $img->height * 0.25 + ); + } + } + + function ApplyPlot($plot) { + + switch (get_class($plot)) + { + case 'BarPlot': + { + $plot->Clear(); + + $color = $this->GetNextColor(); + $plot->SetColor($color); + $plot->SetFillColor($color); + $plot->SetShadow('red', 3, 4, false); + $plot->value->SetAlign('center', 'center'); + break; + } + + case 'LinePlot': + { + $plot->Clear(); + + $plot->SetColor($this->GetNextColor()); + $plot->SetWeight(2); +// $plot->SetBarCenter(); + break; + } + + case 'PiePlot': + { + $plot->ShowBorder(false); + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + + case 'GroupBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'AccBarPlot': + { + $plot->value->SetAlign('center', 'center'); + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + $_plot->SetValuePos('center'); + } + break; + } + + case 'ScatterPlot': + { + break; + } + + + case 'PiePlot3D': + { + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + default: + { + } + } + } +} + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/UniversalTheme.class.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/UniversalTheme.class.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/UniversalTheme.class.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/UniversalTheme.class.php 2020-11-05 05:13:45.000000000 +0000 @@ -0,0 +1,187 @@ +img; + $height = $img->height; + $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25); + */ + $graph->SetFrame(false); + $graph->SetMarginColor('white'); + $graph->SetBox(true, '#DADADA'); +// $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT); + + // legend + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetFillColor('white'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // xaxis + $graph->xaxis->title->SetColor($this->font_color); + $graph->xaxis->SetColor($this->axis_color, $this->font_color); + $graph->xaxis->SetTickSide(SIDE_BOTTOM); + $graph->xaxis->SetLabelMargin(10); + $graph->xaxis->HideTicks(); + $graph->xaxis->SetTitleMargin(15); + //$graph->xaxis->SetLabelMargin(30); + + // yaxis + $graph->yaxis->title->SetColor($this->font_color); + $graph->yaxis->SetColor($this->axis_color, $this->font_color); + $graph->yaxis->SetTickSide(SIDE_LEFT); + $graph->yaxis->SetLabelMargin(8); +// $graph->yaxis->SetTickPositions(array(50, 100, 150)); +// $graph->yaxis->HideLine(); + $graph->yaxis->HideTicks(); + + // grid + $graph->ygrid->SetColor($this->grid_color); + $graph->ygrid->SetFill(true, '#FFFFFF', $this->background_color); + // $graph->ygrid->SetLineStyle('dotted'); + + + // font + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + + $graph->img->SetAntiAliasing(); + } + + + function SetupPieGraph($graph) { + + // graph + $graph->SetFrame(false); + + // legend + $graph->legend->SetFillColor('white'); + + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.80, 'center', 'top'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(4); + + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // title + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + + $graph->SetAntiAliasing(); + } + + + function PreStrokeApply($graph) { + if ($graph->legend->HasItems()) { + $img = $graph->img; + $graph->SetMargin( + $img->raw_left_margin, + $img->raw_right_margin, + $img->raw_top_margin, + is_numeric($img->raw_bottom_margin) ? $img->raw_bottom_margin : $img->height * 0.25 + ); + } + } + + function ApplyPlot($plot) { + + switch (get_class($plot)) + { + case 'GroupBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'AccBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'BarPlot': + { + $plot->Clear(); + + $color = $this->GetNextColor(); + $plot->SetColor($color); + $plot->SetFillColor($color); + $plot->SetShadow('red', 3, 4, false); + break; + } + + case 'LinePlot': + { + $plot->Clear(); + $plot->SetColor($this->GetNextColor().'@0.4'); + $plot->SetWeight(2); + break; + } + + case 'PiePlot': + { + $plot->SetCenter(0.5, 0.45); + $plot->ShowBorder(false); + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + case 'PiePlot3D': + { + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + default: + { + } + } + } +} + + +?> diff -urN smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/VividTheme.class.php smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/VividTheme.class.php --- smeserver-unjunkmgr-2.1.old/root/usr/local/unjunkmgr/jpgraph/themes/VividTheme.class.php 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-unjunkmgr-2.1/root/usr/local/unjunkmgr/jpgraph/themes/VividTheme.class.php 2020-05-26 05:18:30.000000000 +0100 @@ -0,0 +1,179 @@ +img; + $height = $img->height; + $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25); + */ + $graph->SetFrame(false); + $graph->SetMarginColor('white'); + $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT); + + // legend + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.85, 'center', 'top'); + $graph->legend->SetFillColor('white'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(3); + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // xaxis + $graph->xaxis->title->SetColor($this->font_color); + $graph->xaxis->SetColor($this->axis_color, $this->font_color); + $graph->xaxis->SetTickSide(SIDE_BOTTOM); + $graph->xaxis->SetLabelMargin(10); + + // yaxis + $graph->yaxis->title->SetColor($this->font_color); + $graph->yaxis->SetColor($this->axis_color, $this->font_color); + $graph->yaxis->SetTickSide(SIDE_LEFT); + $graph->yaxis->SetLabelMargin(8); + $graph->yaxis->HideLine(); + $graph->yaxis->HideTicks(); + $graph->xaxis->SetTitleMargin(15); + + // grid + $graph->ygrid->SetColor($this->grid_color); + $graph->ygrid->SetLineStyle('dotted'); + + + // font + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + +// $graph->img->SetAntiAliasing(); + } + + + function SetupPieGraph($graph) { + + // graph + $graph->SetFrame(false); + + // legend + $graph->legend->SetFillColor('white'); + + $graph->legend->SetFrameWeight(0); + $graph->legend->Pos(0.5, 0.80, 'center', 'top'); + $graph->legend->SetLayout(LEGEND_HOR); + $graph->legend->SetColumns(4); + + $graph->legend->SetShadow(false); + $graph->legend->SetMarkAbsSize(5); + + // title + $graph->title->SetColor($this->font_color); + $graph->subtitle->SetColor($this->font_color); + $graph->subsubtitle->SetColor($this->font_color); + + $graph->SetAntiAliasing(); + } + + + function PreStrokeApply($graph) { + if ($graph->legend->HasItems()) { + $img = $graph->img; + $graph->SetMargin( + $img->raw_left_margin, + $img->raw_right_margin, + $img->raw_top_margin, + is_numeric($img->raw_bottom_margin) ? $img->raw_bottom_margin : $img->height * 0.25 + ); + } + } + + function ApplyPlot($plot) { + + switch (get_class($plot)) + { + case 'GroupBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'AccBarPlot': + { + foreach ($plot->plots as $_plot) { + $this->ApplyPlot($_plot); + } + break; + } + + case 'BarPlot': + { + $plot->Clear(); + + $color = $this->GetNextColor(); + $plot->SetColor($color); + $plot->SetFillColor($color); + $plot->SetShadow('red', 3, 4, false); + break; + } + + case 'LinePlot': + { + $plot->Clear(); + $plot->SetColor($this->GetNextColor().'@0.4'); + $plot->SetWeight(2); +// $plot->SetBarCenter(); + break; + } + + case 'PiePlot': + { + $plot->SetCenter(0.5, 0.45); + $plot->ShowBorder(false); + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + case 'PiePlot3D': + { + $plot->SetSliceColors($this->GetThemeColors()); + break; + } + + default: + { + } + } + } +} + + +?>