Changeset 575 for trunk/web2/addons/job_monarch

Timestamp:

01/29/09 14:29:10 (15 years ago)

Author:

ramonb

Message:

job_monarch/libtoga.php:

• selected node in clusterimage has different border color
• even nodes without jobs are now displayed in clusterimage

File:

• trunk/web2/addons/job_monarch/libtoga.php (modified) (8 diffs)

trunk/web2/addons/job_monarch/libtoga.php

@@ -1049 +1049 @@
                 $this->small            = false;
                 $this->big              = false;
+                $this->selected         = false;
         }
 
@@ -1177 +1178 @@
         {
                 $this->showinfo = $showinfo;
+        }
+
+        function setSelected()
+        {
+                $this->selected = true;
         }
 
@@ -1268 +1274 @@
                 }
 
-                imageFilledRectangle( $this->image, $this->x, $this->y, $this->x+($size-$sep), $this->y+($size-$sep), $black_color );
+                $select_color   = imageColorAllocate( $this->image, 91, 255, 41 );
+
+                if( $this->selected )
+                {
+                        imageFilledRectangle( $this->image, $this->x, $this->y, $this->x+($size), $this->y+($size), $select_color );
+                }
+                else
+                {
+                        imageFilledRectangle( $this->image, $this->x, $this->y, $this->x+($size-$sep), $this->y+($size-$sep), $black_color );
+                }
 
                 if( $this->showinfo)
@@ -1347 +1362 @@
                 $this->height           = 0;
                 $this->output           = 1;
+                $this->selected         = '';
         }
 
@@ -1396 +1412 @@
                                 $mynjobs = $node->getJobs();
 
-                                if( count( $mynjobs ) > 0 )
+                                if( $filtername == 'host' && $hostname == $filtervalue )
+                                {
+                                        $addhost        = 1;
+                                        $this->selected = $hostname;
+                                }
+                                else if( count( $mynjobs ) > 0 )
                                 {
                                         foreach( $mynjobs as $myjob )
@@ -1419 +1440 @@
                                                                 else
                                                                 {
-                                                                        if( $filtername == 'host' && $hostname == $filtervalue )
+                                                                        if( $jobs[$myjob][$filtername] == $filtervalue )
                                                                         {
                                                                                 $addhost = 1;
+                                                                                continue;
                                                                         }
-                                                                        else
+                                                                        else if( $jobs[$myjob][$filtername] != $filtervalue )
                                                                         {
-                                                                                if( $jobs[$myjob][$filtername] == $filtervalue )
-                                                                                {
-                                                                                        $addhost = 1;
-                                                                                        continue;
-                                                                                }
-                                                                                else if( $jobs[$myjob][$filtername] != $filtervalue )
-                                                                                {
-                                                                                        $addhost = 0;
-                                                                                }
+                                                                                $addhost = 0;
                                                                         }
                                                                         if( $filtername == 'query' )
@@ -1557 +1571 @@
                 $jobs = $mydatag->getJobs();
                 $filtered_nodes = $this->filterNodes( $jobs, $nodes );
+                $selected_host  = $this->selected;
 
                 if( $SORTBY_HOSTNAME != "" )
@@ -1951 +1966 @@
                                                         $nodes[$cur_node]->setShowinfo( 0 );
                                                 }
+                                                else
+                                                {
+                                                        if( $selected_host != '' && $host == $selected_host )
+                                                        {
+                                                                $nodes[$cur_node]->setSelected();
+                                                        }
+                                                }
 
                                                 $nodes[$cur_node]->setCoords( $x, $y );