Changeset 122 for trunk/web/addons/toga/libtoga.php

Timestamp:

06/01/05 16:55:14 (19 years ago)

Author:

bastiaans

Message:

web/addons/toga/templates/overview.tpl:

• Cosmetic HTML change

web/addons/toga/index.php:

• Added Joblist filter tree text

web/addons/toga/overview.php:

• Setup clusterimage filter

web/addons/toga/image.php:

• Added filter handling

web/addons/toga/libtoga.php:

• Added setFilter and assorted for ClusterImage? and NodeImage?

File:

• trunk/web/addons/toga/libtoga.php (modified) (6 diffs)

trunk/web/addons/toga/libtoga.php

@@ -334 +334 @@
 class NodeImage {
 
-        var $image, $x, $y, $hostname, $jobs, $tasks;
+        var $image, $x, $y, $hostname, $jobs, $tasks, $showinfo;
 
         function NodeImage( $hostname ) {
@@ -345 +345 @@
                 $this->hostname = $hostname;
                 $this->cpus = $this->determineCpus();
+                $this->showinfo = 1;
         }
 
@@ -400 +401 @@
         }
 
+        function getHostname() {
+                return $this->hostname;
+        }
+
         function getJobs() {
                 return $this->jobs;
         }
 
+        function setShowinfo( $showinfo ) {
+                $this->showinfo = $showinfo;
+        }
+
         function draw() {
 
-                global $SMALL_CLUSTERIMAGE_NODEWIDTH, $JOB_NODE_MARKING_ALLCPUS, $JOB_NODE_MARKING_SINGLECPU;
+                $this->drawSmall();
+        }
+
+        function drawBig() {
+
+        }
+
+        function drawSmall() {
+
+                global $SMALL_CLUSTERIMAGE_NODEWIDTH;
                 global $JOB_NODE_MARKING;
 
-                $this->load = $this->determineLoad();
-
-                if( !isset( $this->image ) or !isset( $this->x ) or !isset( $this->y ) ) {
-                        printf( "aborting\n" );
-                        printf( "x %d y %d load %f\n", $this->x, $this->y, $load );
-                        return;
-                }
-
                 $black_color = imageColorAllocate( $this->image, 0, 0, 0 );
-
-                // Convert Ganglias Hexadecimal load color to a Decimal one
-                //
-                $load = $this->determineLoad(); 
-                $my_loadcolor = $this->colorHex( load_color($load) );
-
                 $size = $SMALL_CLUSTERIMAGE_NODEWIDTH;
 
                 imageFilledRectangle( $this->image, $this->x, $this->y, $this->x+($size), $this->y+($size), $black_color );
-                imageFilledRectangle( $this->image, $this->x+1, $this->y+1, $this->x+($size-1), $this->y+($size-1), $my_loadcolor );
-
-                $nr_jobs = count( $this->jobs );
-
-                $node_mark = null;
-
-                if( count( $this->jobs ) > 0 )
-                        $node_mark = $JOB_NODE_MARKING;
-
-                //      if( $this->tasks < $this->cpus )
-                //              $node_mark = $JOB_NODE_MARKING_SINGLECPU;
-
-                //      else if( $this->tasks == $this->cpus )
-                //              $node_mark = $JOB_NODE_MARKING_ALLCPUS;
-
-                if( $node_mark )
-                        imageString( $this->image, 1, $this->x+(($size/2)-2), $this->y+(($size/2)-3), $node_mark, $black_color );
+
+                if( $this->showinfo) {
+                
+                        $this->load = $this->determineLoad();
+
+                        if( !isset( $this->image ) or !isset( $this->x ) or !isset( $this->y ) ) {
+                                printf( "aborting\n" );
+                                printf( "x %d y %d load %f\n", $this->x, $this->y, $load );
+                                return;
+                        }
+
+
+                        // Convert Ganglias Hexadecimal load color to a Decimal one
+                        //
+                        $load = $this->determineLoad(); 
+                        $usecolor = $this->colorHex( load_color($load) );
+                        imageFilledRectangle( $this->image, $this->x+1, $this->y+1, $this->x+($size-1), $this->y+($size-1), $usecolor );
+                        if( count( $this->jobs ) > 0 )
+                                imageString( $this->image, 1, $this->x+(($size/2)-2), $this->y+(($size/2)-3), $JOB_NODE_MARKING, $black_color );
+
+                } else {
+
+                        // White
+                        $usecolor = imageColorAllocate( $this->image, 255, 255, 255 );
+                        imageFilledRectangle( $this->image, $this->x+1, $this->y+1, $this->x+($size-1), $this->y+($size-1), $usecolor );
+                }
+
+
         }
 
@@ -470 +485 @@
 
         var $dataget, $image, $clustername;
-
-        function ClusterImage( $clustername, $data_gather ) {
-
-                if( !isset( $data_gather ) )
-                        $this->dataget = new DataGatherer();
-                else
-                        $this->dataget = $data_gather;
-
+        var $filtername, $filtervalue;
+
+        function ClusterImage( $clustername ) {
+
+                $this->dataget = new DataGatherer();
                 $this->clustername = $clustername;
+                $this->filtername = null;
+                $this->filtervalue = null;
+        }
+
+        function setFilter( $filtername, $filtervalue ) {
+
+                //printf( "filter set to %s = %s\n", $filtername, $filtervalue );
+                $this->filtername = $filtername;
+                $this->filtervalue = $filtervalue;
+        }
+
+        function filterNodes( $jobs, $nodes ) {
+
+                $filtered_nodes = array();
+
+                foreach( $nodes as $node ) {
+
+                        $mynjobs = $node->getJobs();
+                        $hostname = $node->getHostname();
+
+                        if( $this->filtername ) {
+                                foreach( $mynjobs as $myjob )
+
+                                        if( $this->filtername == 'jobid' && $node->hasJob( $this->filtervalue) )
+                                                $filtered_nodes[] = $hostname;
+                                        else if( $jobs[$myjob][$this->filtername] == $this->filtervalue  && !in_array( $hostname, $filtered_nodes  ) )
+                                                $filtered_nodes[] = $hostname;
+                        } else
+                                $filtered_nodes[] = $hostname;
+                }
+
+                return $filtered_nodes;
         }
 
@@ -526 +570 @@
                 imageFill( $image, 0, 0, $colorwhite );
 
+                $jobs = $mydatag->getJobs();
+                //printf("filtername = %s\n", $filtername );
+                $filtered_nodes = $this->filterNodes( $jobs, $nodes );
+
+                //print_r($filtered_nodes);
+
                 for( $n = 0; $n < $node_rows; $n++ ) {
                         
@@ -536 +586 @@
                                 $host = $nodes_hosts[$cur_node];
 
+
                                 if( isset( $nodes[$host] ) ) {
 
                                         $nodes[$host]->setCoords( $x, $y );
                                         $nodes[$host]->setImage( $image );
+
+                                        if( !in_array( $host, $filtered_nodes ) )
+                                                $nodes[$host]->setShowinfo( 0 );
+
                                         $nodes[$host]->draw();
                                 }