Changeset 333

Timestamp:

04/22/07 22:59:52 (16 years ago)

Author:

bastiaans

Message:

job_monarch/libtoga.php:

• fixed small cluster image to properly align and display text

job_monarch/conf.php:

• changed maxwidth for small cluster image

job_monarch/version.php:

• set version to SVN

Location:

trunk/web/addons/job_monarch

Files:

• conf.php (modified) (1 diff)
• libtoga.php (modified) (3 diffs)
• version.php (modified) (1 diff)

trunk/web/addons/job_monarch/conf.php

@@ -40 +40 @@
 // (250 pixels is same width as Ganglia's pie chart)
 //
-$SMALL_CLUSTERIMAGE_MAXWIDTH = 250;
+$SMALL_CLUSTERIMAGE_MAXWIDTH = 300;
 
 // The size of a single node in the small clusterimage

trunk/web/addons/job_monarch/libtoga.php

@@ -1222 +1222 @@
                         $fontspaceing   = 2;
 
+                        if( $this->isSmall() ) 
+                        {
+                                $y_offset       = $y_offset + (2 * $fontspaceing) + $fontheight;
+                        }
+
                         if( $this->isBig() ) 
                         {
@@ -1248 +1253 @@
 
                         imageFill( $image, 0, 0, $colorwhite );
+
+                        if( $this->isSmall() ) {
+
+                                $colorblue      = imageColorAllocate( $image, 0, 0, 255 );
+
+                                imageString( $image, $font, 2, 2, "Monarch Joblist - cluster: ".$this->clustername, $colorblue );
+                        }
 
                         if( $this->isBig() ) 
@@ -1308 +1320 @@
                                                         $nodes[$cur_node]->drawBig();
                                         }
-                                        if( $n == $x_min )
+                                        if( $this->isBig() ) 
                                         {
-                                                $mfontspacing   = 1;
-                                                $ylabel_x       = $x - ( $fontwidth * strlen( $y_max ) ) - $mfontspacing;
-                                                $ylabel_y       = $y;
-
-                                                imageString( $image, $font, $ylabel_x, $ylabel_y, strval( $m ), $colorblue );
-                                        }
-                                        if( $m == $y_min )
-                                        {
-                                                $mfontspacing   = 2;
-                                                $xlabel_y       = $y - ( $fontheight * strlen( $x_max ) );
-                                                $xlabel_x       = $x + $mfontspacing; 
-
-                                                imageStringDown( $image, $font, $xlabel_x, $xlabel_y, strval( $n ), $colorblue );
+                                                if( $n == $x_min )
+                                                {
+                                                        $mfontspacing   = 1;
+                                                        $ylabel_x       = $x - ( $fontwidth * strlen( $y_max ) ) - $mfontspacing;
+                                                        $ylabel_y       = $y;
+
+                                                        imageString( $image, $font, $ylabel_x, $ylabel_y, strval( $m ), $colorblue );
+                                                }
+                                                if( $m == $y_min )
+                                                {
+                                                        $mfontspacing   = 2;
+                                                        $xlabel_y       = $y - ( $fontheight * strlen( $x_max ) );
+                                                        $xlabel_x       = $x + $mfontspacing; 
+
+                                                        imageStringDown( $image, $font, $xlabel_x, $xlabel_y, strval( $n ), $colorblue );
+                                                }
                                         }
 

trunk/web/addons/job_monarch/version.php

@@ -22 +22 @@
  */
 
-$monarchversion = "0.2";
+$monarchversion = "0.2+SVN";
 ?>