Changeset 428 for trunk/web/addons

Timestamp:

07/08/07 19:08:05 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/libtoga.php:

• fixed: big ClusterImage? width can also be smaller than maxwidth

File:

• trunk/web/addons/job_monarch/libtoga.php (modified) (2 diffs)

trunk/web/addons/job_monarch/libtoga.php

@@ -1333 +1333 @@
 
                         $image_width    = $x_offset + ($node_width * ($x_max-$x_min+2));
-                        if( $this->isBig() ) 
-                        {
-                                $image_width    = ($image_width < $this->width) ? $image_width : $this->width;
-                        }
-                        else if( $this->isSmall() )
-                        {
-                                $image_width    = $this->width;
-                        }
+
+                        if( $this->isSmall() ) 
+                        {
+                                $image_width    = $max_width;
+                        } else if( $this->isBig() ) 
+                        {
+                                $image_width    = ($image_width < $max_width) ? $image_width : $max_width;
+                        }
+                        //else if( $this->isSmall() )
+                        //{
+                        //      $image_width    = $this->width;
+                        //}
                         $image_height   = $y_offset + ($node_width * ($y_max-$y_min+2));
 
@@ -1473 +1477 @@
                 else
                 {
-                        $image          = imageCreateTrueColor( $max_width, ($y_offset + (($node_rows*$node_width)+1) ) );
+                        if( $this->isSmall() ) {
+                                $image          = imageCreateTrueColor( $max_width, ($y_offset + (($node_rows*$node_width)+1) ) );
+                        } else if( $this->isBig() ) {
+                                $image_width    = ($node_width * $nodes_nr) + 2;
+                                $image_width    = ($image_width < $max_width) ? $image_width : $max_width;
+                                $image          = imageCreateTrueColor( $image_width, ($y_offset + (($node_rows*$node_width)+1) ) );
+                        }
                         $colorwhite     = imageColorAllocate( $image, 255, 255, 255 );