Changeset 147 for trunk

Timestamp:

06/20/05 10:59:00 (18 years ago)

Author:

bastiaans

Message:

toga/overview.php:

• Fixed randomColor function now color should really differ enough

File:

• trunk/web/addons/toga/overview.php (modified) (2 diffs)

trunk/web/addons/toga/overview.php

@@ -164 +164 @@
         $min_diff = 50;
 
-        $c1r = decHex( colorRed( $first ) );
-        $c1g = decHex( colorGreen( $first ) );
-        $c1b = decHex( colorBlue( $first ) );
-
-        $c2r = decHex( colorRed( $second ) );
-        $c2g = decHex( colorGreen( $second ) );
-        $c2b = decHex( colorBlue( $second ) );
+        $c1r = hexDec( colorRed( $first ) );
+        $c1g = hexDec( colorGreen( $first ) );
+        $c1b = hexDec( colorBlue( $first ) );
+
+        $c2r = hexDec( colorRed( $second ) );
+        $c2g = hexDec( colorGreen( $second ) );
+        $c2b = hexDec( colorBlue( $second ) );
 
         $rdiff = ($c1r >= $c2r) ? $c1r - $c2r : $c2r - $c1r;
@@ -184 +184 @@
 function randomColor( $known_colors ) {
 
-        $start = hexdec( "004E00" );
-        $end = hexdec( "FFFFFF" );
-
-        if( count( $known_colors ) == 0 )
-                return dechex(rand( $start, $end ));
-
-        $color_changed = TRUE;
-
-        while( $color_changed ) {
-
-                $color_changed = FALSE;
-
-                foreach( $known_colors as $old ) {
-
-                        if( !isset( $new ) )
-                                $new = rand( $start, $end );
-
-                        if( !colorDiffer( dechex( $new ), $old ) )
-
-                                while( !colorDiffer( $new, $old ) ) {
-
-                                        $new = rand( $start, $end );
-                                        $color_changed = TRUE;
-                                }
-                }
+        $start = "004E00";
+        
+        $start_red = colorRed( $start );
+        $start_green = colorGreen( $start );
+        $start_blue = colorBlue( $start );
+        
+        $end = "FFFFFF";
+
+        $end_red = colorRed( $end );
+        $end_green = colorGreen( $end );
+        $end_blue = colorBlue( $end );
+
+        $change_color = TRUE;
+
+        while( $change_color ) {
+
+                $change_color = FALSE;
+
+                $new_red = rand( hexDec( $start_red ), hexDec( $end_red ) );
+                $new_green = rand( hexDec( $start_green ), hexDec( $end_green ) );
+                $new_blue = rand( hexDec( $start_blue ), hexDec( $end_blue ) );
+
+                $new = decHex( $new_red ) . decHex( $new_green ) . decHex( $new_blue );
+
+                foreach( $known_colors as $old )
+
+                        if( !colorDiffer( $new, $old ) )
+
+                                $change_color = TRUE;
         }
 
         // Whoa! Actually found a good color ;)
-        return dechex( $new );
+        return $new;
 }