Changeset 530 for trunk/web

Timestamp:

07/02/08 13:17:49 (16 years ago)

Author:

ramonb

Message:

web/addons/job_monarch/overview.php:

• remove weighing jobs for pie chart: this is done by pChart now

web/addons/job_monarch/chart.php:

• small layout fix

Location:

trunk/web/addons/job_monarch

Files:

• chart.php (modified) (1 diff)
• overview.php (modified) (3 diffs)

trunk/web/addons/job_monarch/chart.php

@@ -46 +46 @@
 // Draw the pie slices and percentages text
 //
-$myChart->drawPieGraph( $DataSet->GetData(), $DataSet->GetDataDescription(), 150, 90, 110, TRUE, TRUE, 50, 20, 20 );
+$myChart->drawPieGraph( $DataSet->GetData(), $DataSet->GetDataDescription(), 160, 100, 110, TRUE, TRUE, 50, 20, 20 );
 
 // Draw legend text

trunk/web/addons/job_monarch/overview.php

@@ -274 +274 @@
         $used_cpus              = $nr_cpus - $empty_cpus;
 
-        $empty_percentage       = ($empty_cpus / $nr_cpus) * 100;
+        //$empty_percentage     = ($empty_cpus / $nr_cpus) * 100;
+        $empty_percentage       = $empty_cpus;
 
         $qcolors                = array();
@@ -300 +301 @@
                         // - what percentage of the cpus is in use by this job
                         //
-                        $job_weight[$myjob]     = ( $job_cpu / $nr_cpus );
-
+                        //$job_weight[$myjob]   = ( $job_cpu / $nr_cpus );
+                        $job_weight[$myjob]     = $job_cpu;
 
                         if( isset( $piefilter ) ) {
@@ -382 +383 @@
         }
 
+        //$percentage   = 0;
+        //$slice_count  = 0;
+
+        // Find rounding errors: total has to be 100
+        //
+        //foreach( $graphvals as $name => $totalweight) 
+        //{
+        //      $percentage     = $percentage + $totalweight;
+        //      $slice_count    = $slice_count + 1;
+        //}
+
+        //$round_offset = ( 100 - $percentage ) / $slice_count;
+
         foreach( $graphvals as $name => $totalweight) 
         {
-                $percentage     = ( $totalweight * 100 );
+                //$percentage   = ( $totalweight * 100 ) + $round_offset;
+                $percentage     = $totalweight;
                 
                 $color          = randomColor( $qcolors );