Changeset 6176 for extensions/ColorStat/cstat_aip_install.class.inc.php

Timestamp:

May 13, 2010, 10:21:05 PM (14 years ago)

Author:

grum

Message:

Improve algorythm for colors analysis + use GPCRequestBuilder interface instead of a local interface

File:

• extensions/ColorStat/cstat_aip_install.class.inc.php (modified) (5 diffs)

extensions/ColorStat/cstat_aip_install.class.inc.php

@@ -126 +126 @@
                 dirname($this->getFileLocation()).'/admin/cstat_install_page.tpl');
 
-    $smallColorTable=ColorStat::getColorTable($this->colorTableSize['small'][0],$this->colorTableSize['small'][1]);
-    $largeColorTable=ColorStat::getColorTable($this->colorTableSize['large'][0],$this->colorTableSize['large'][1]);
-    $template->assign('smallTableColor', $this->htmlColorTable($smallColorTable, 19, '', 'color0px'));
-    $template->assign('largeTableColor', $this->htmlColorTable($largeColorTable, 10, '', 'color0px'));
+    $smallColorTable=ColorStat::getColorTable(CStat_root::$colorTableSize['small'][0],CStat_root::$colorTableSize['small'][1]);
+    $largeColorTable=ColorStat::getColorTable(CStat_root::$colorTableSize['large'][0],CStat_root::$colorTableSize['large'][1]);
+    $template->assign('smallTableColor', CStat_functions::htmlColorTable($smallColorTable, 19, '', 'color0px'));
+    $template->assign('largeTableColor', CStat_functions::htmlColorTable($largeColorTable, 10, '', 'color0px'));
 
     $template->assign(
       'smallColorList1',
-      $this->htmlColorList(
+      CStat_functions::htmlColorList(
         ColorStat::getFileColors(dirname($this->getFileLocation()).'/image/sample1.png', $smallColorTable, Array('quality' => 8, 'numColors' => 16)),
         16, 18, '', 'colorListSample color0px'
@@ -142 +142 @@
     $template->assign(
       'largeColorList1',
-      $this->htmlColorList(
+      CStat_functions::htmlColorList(
         ColorStat::getFileColors(dirname($this->getFileLocation()).'/image/sample1.png', $largeColorTable, Array('quality' => 8, 'numColors' => 16)),
         16, 18, '', 'colorListSample color0px'
@@ -151 +151 @@
     $template->assign(
       'smallColorList2',
-      $this->htmlColorList(
+      CStat_functions::htmlColorList(
         ColorStat::getFileColors(dirname($this->getFileLocation()).'/image/sample2.png', $smallColorTable, Array('quality' => 8, 'numColors' => 16)),
         16, 18, '', 'colorListSample color0px'
@@ -160 +160 @@
     $template->assign(
       'largeColorList2',
-      $this->htmlColorList(
+      CStat_functions::htmlColorList(
         ColorStat::getFileColors(dirname($this->getFileLocation()).'/image/sample2.png', $largeColorTable, Array('quality' => 8, 'numColors' => 16)),
         16, 18, '', 'colorListSample color0px'
@@ -205 +205 @@
     $this->saveConfig();
 
-    $colorTable=ColorStat::getColorTable($this->colorTableSize[$tableSize][0],$this->colorTableSize[$tableSize][1]);
-
-    foreach($colorTable as $key => $val)
+    $colorTable=ColorStat::getColorTable(CStat_root::$colorTableSize[$tableSize][0],CStat_root::$colorTableSize[$tableSize][1]);
+
+    foreach($colorTable as $key => $hue)
     {
-      foreach($val as $key2 => $val2)
+      foreach($hue as $key2 => $saturation)
       {
-        $hsv=$val2->get();
-        $sql.=(($sql=="")?"":", ")."('".$val2->getRGB()->getHexString()."',
-               '".$hsv['H']."',
-               '".$hsv['S']."',
-               '".$hsv['V']."',
-               0, 0)";
+        foreach($saturation as $key3=>$value)
+        {
+          $hsv=$value->get();
+          $sql.=(($sql=="")?"":", ")."('".$value->getRGB()->getHexString()."',
+                 '".$hsv['H']."',
+                 '".$hsv['S']."',
+                 '".$hsv['V']."',
+                 0, 0)";
+        }
       }
     }