Changeset 330

Timestamp:

04/22/07 15:51:37 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/overview.php:

• removed size setting of clusterimage in html assignment

web/addons/job_monarch/libtoga.php:

• changed clusterimage width/height determination

Location:

trunk/web/addons/job_monarch

Files:

• libtoga.php (modified) (2 diffs)
• overview.php (modified) (1 diff)

trunk/web/addons/job_monarch/libtoga.php

@@ -1219 +1219 @@
                         //print_r( $nodes );
 
-                        $image          = imageCreateTrueColor( $this->width, ($y_offset + (($node_rows*$node_width)+1) ) );
+                        $image_width    = $x_offset + ($node_width * ($x_max-$x_min+2));
+                        $image_width    = ($image_width < $this->width) ? $image_width : $this->width;
+                        $image_height   = $y_offset + ($node_width * ($y_max-$y_min+2));
+
+                        $this->width    = $image_width;
+                        $this->heigth   = $image_heigth;
+
+                        $image          = imageCreateTrueColor( $image_width, $image_height );
                         $colorwhite     = imageColorAllocate( $image, 255, 255, 255 );
 
@@ -1244 +1251 @@
                                         }
 
-                                        if( isset( $nodes[$cur_node] ) ) {
-
-
+                                        if( isset( $nodes[$cur_node] ) ) 
+                                        {
                                                 $host   = $nodes[$cur_node]->getHostname();
 

trunk/web/addons/job_monarch/overview.php

@@ -72 +72 @@
         $tpl->assign( "clusterimage", "./image.php?". session_name() . "=" . session_id() ."&c=".rawurlencode($clustername)."&view=big-clusterimage".$filter_image_url );
 
-        $tpl->assign( "clusterimage_width", $ic->getWidth() );
-        $tpl->assign( "clusterimage_height", $ic->getHeight() );
+        //$tpl->assign( "clusterimage_width", $ic->getWidth() );
+        //$tpl->assign( "clusterimage_height", $ic->getHeight() );
 
         $tpl->newBlock( "node_clustermap" );