Changeset 305 for trunk/web/addons

Timestamp:

04/16/07 17:32:56 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• added: big clusterimage values
• changed: small clusterimage values

web/addons/job_monarch/image.php:

• added: setting of ClusterImage? size

web/addons/job_monarch/libtoga.php:

• added: ClusterImage? and NodeImage? size handling

Location:

trunk/web/addons/job_monarch

Files:

• conf.php (modified) (1 diff)
• image.php (modified) (2 diffs)
• libtoga.php (modified) (8 diffs)

trunk/web/addons/job_monarch/conf.php

@@ -35 +35 @@
 // The size of a single node in the small clusterimage
 //
-$SMALL_CLUSTERIMAGE_NODEWIDTH = 11;
+$SMALL_CLUSTERIMAGE_NODEWIDTH = 7;
+
+// Max size of small clusterimage
+// (250 pixels is same width as Ganglia's pie chart)
+//
+$BIG_CLUSTERIMAGE_MAXWIDTH = 250;
+
+// The size of a single node in the small clusterimage
+//
+$BIG_CLUSTERIMAGE_NODEWIDTH = 11;
+
+// Max size of small host image
+//
+$SMALL_HOSTIMAGE_MAXWIDTH = 450;
 
 // How to mark nodes with a job in clusterimage

trunk/web/addons/job_monarch/image.php

@@ -61 +61 @@
         $data_gatherer->parseXML();
 
-        if( $data_gatherer->isJobmonRunning() )
+        if( $data_gatherer->isJobmonRunning() ) {
                 $ic = new ClusterImage( $clustername );
-        else
+                $ic->setSmall();
+        } else {
                 $ic = new EmptyImage();
+        }
 
         $ic->draw();
@@ -74 +76 @@
 
         $ic = new ClusterImage( $clustername );
+        $ic->setBig();
 
         if( isset( $filter ) ) {

trunk/web/addons/job_monarch/libtoga.php

@@ -769 +769 @@
         function NodeImage( $hostname ) {
 
+                global $SMALL_CLUSTERIMAGE_NODEWIDTH;
+
                 $this->jobs = array();
                 //$this->image = $image;
@@ -777 +779 @@
                 $this->cpus = $this->determineCpus();
                 $this->showinfo = 1;
+                $this->size = $SMALL_CLUSTERIMAGE_NODEWIDTH;
         }
 
@@ -844 +847 @@
         }
 
+        function drawSmall() {
+
+                global $SMALL_CLUSTERIMAGE_NODEWIDTH;
+
+                $this->size     = $SMALL_CLUSTERIMAGE_NODEWIDTH;
+
+                $this->draw();
+        }
+
+        function drawBig() {
+
+                global $BIG_CLUSTERIMAGE_NODEWIDTH;
+
+                $this->size     = $BIG_CLUSTERIMAGE_NODEWIDTH;
+
+                $this->draw();
+        }
+
         function draw() {
 
-                $this->drawSmall();
-        }
-
-        function drawBig() {
-
-        }
-
-        function drawSmall() {
-
-                global $SMALL_CLUSTERIMAGE_NODEWIDTH;
                 global $JOB_NODE_MARKING;
 
                 $black_color = imageColorAllocate( $this->image, 0, 0, 0 );
-                $size = $SMALL_CLUSTERIMAGE_NODEWIDTH;
+                $size = $this->size;
 
                 imageFilledRectangle( $this->image, $this->x, $this->y, $this->x+($size), $this->y+($size), $black_color );
@@ -920 +931 @@
         function ClusterImage( $clustername ) {
 
-                //printf( "image cluster = %s\n", $clustername );
-                $this->dataget = new DataGatherer( $clustername );
-                $this->clustername = $clustername;
-                $this->filters = array();
+                $this->dataget          = new DataGatherer( $clustername );
+                $this->clustername      = $clustername;
+                $this->filters          = array();
+                $this->size             = 's';
+        }
+
+        function setSmall() {
+                $this->size     = 's';
+        }
+
+        function setBig() {
+                $this->size     = 'b';
+        }
+
+        function isSmall() {
+                return ($this->size == 's');
+        }
+
+        function isBig() {
+                return ($this->size == 'b');
         }
 
         function setFilter( $filtername, $filtervalue ) {
 
-                //printf("filter %s = %s\n", $filtername, $filtervalue );
-                //printf( "filter set to %s = %s\n", $filtername, $filtervalue );
                 $this->filters[$filtername] = $filtervalue;
-                //print_r($this->filters);
         }
 
@@ -953 +977 @@
 
                                                 foreach( $this->filters as $filtername => $filtervalue ) {
-
-                                                        //printf("filter bla %s = %s\n", $filtername,$filtervalue );
 
                                                         if( $filtername!=null && $filtername!='' ) {
@@ -960 +982 @@
                                                                 if( $filtername == 'jobid' && !$node->hasJob( $filtervalue) ) {
                                                                         $addhost = 0;
-                                                                        //printf("host %s has no job %s\n", $hostname, $filtervalue);
                                                                 } else if( $filtername != 'jobid' ) {
-                                                                        //printf("myjob is %s\n", $myjob );
                                                                         if( $jobs[$myjob][$filtername] != $filtervalue ) {
-                                                                                //printf("host %s has no job with %s=%s\n", $hostname, $filtername, $filtervalue);
                                                                                 $addhost = 0;
                                                                         }
@@ -984 +1003 @@
         function draw() {
 
-                //printf("stopt met uitvoer");
-                //return;
-
                 global $SMALL_CLUSTERIMAGE_MAXWIDTH, $SMALL_CLUSTERIMAGE_NODEWIDTH;
+                global $BIG_CLUSTERIMAGE_MAXWIDTH, $BIG_CLUSTERIMAGE_NODEWIDTH;
         
                 $mydatag = $this->dataget;
                 $mydatag->parseXML();
 
-                //$max_width = 250;
-                //$node_width = 11;
-
-                $max_width = $SMALL_CLUSTERIMAGE_MAXWIDTH;
-                $node_width = $SMALL_CLUSTERIMAGE_NODEWIDTH;
-
-                //printf( "cmaxw %s nmaxw %s", $SMALL_CLUSTERIMAGE_MAXWIDTH, $SMALL_CLUSTERIMAGE_NODEWIDTH );
+                if( $this->isSmall() ) {
+                        $max_width = $SMALL_CLUSTERIMAGE_MAXWIDTH;
+                        $node_width = $SMALL_CLUSTERIMAGE_NODEWIDTH;
+                } else if( $this->isBig() ) {
+                        $max_width = $BIG_CLUSTERIMAGE_MAXWIDTH;
+                        $node_width = $BIG_CLUSTERIMAGE_NODEWIDTH;
+                }
 
                 $nodes = $mydatag->getNodes();
@@ -1056 +1073 @@
                                                 $nodes[$host]->setShowinfo( 0 );
 
-                                        $nodes[$host]->draw();
+                                        if( $this->isSmall() )
+                                                $nodes[$host]->drawSmall();
+                                        else if( $this->isBig() )
+                                                $nodes[$host]->drawBig();
                                 }
                         }