Changeset 332 for trunk/web/addons

Timestamp:

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

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• incread BIG_CLUSTERIMAGE_MAXWIDTH so that all LISA's 39 racks will fit :P

web/addons/job_monarch/libtoga.php:

• draw x/y labels not until node draw loop complete
• fixed valid x row determination

Location:

trunk/web/addons/job_monarch

Files:

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

trunk/web/addons/job_monarch/conf.php

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

trunk/web/addons/job_monarch/libtoga.php

@@ -1273 +1273 @@
                                         }
 
-                                        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 );
-                                        }
-
                                         if( isset( $nodes[$cur_node] ) ) 
                                         {
@@ -1306 +1289 @@
                                                         continue;
                                                 }
-                                                if( ( $rx - $x_min ) > $n )
+                                                if( ( $rx ) > $n )
                                                 {
-                                                        $m      = $y_max;
+                                                        $m      = $y_max + 1;
                                                         continue;
                                                 }
@@ -1325 +1308 @@
                                                         $nodes[$cur_node]->drawBig();
                                         }
+                                        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 );
+                                        }
+
                                         $cur_node++;
                                 }