Changeset 6176 for extensions/ColorStat/cstat_aip.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.class.inc.php (modified) (6 diffs)

extensions/ColorStat/cstat_aip.class.inc.php

@@ -221 +221 @@
                 dirname($this->getFileLocation()).'/admin/cstat_stat.tpl');
 
-    $colorTable=$this->getColorTableWithStat();
+    $colorTable=CStat_functions::getColorTableWithStat();
 
 
     $datas=Array(
       //'themeconf' => Array('name' => $template->get_themeconf('name')),
-      'colorTable' => $this->htmlColorTable(
+      'colorTable' => CStat_functions::htmlColorTable(
                         $colorTable,
                         ($this->config['analyze_colorTable']=='small')?19:10,
                         "",
-                        "color0px"
+                        "color0px",
+                        "<br>"
                       ),
       'urlRequest' => $this->getAdminLink(),
@@ -250 +251 @@
                 dirname($this->getFileLocation()).'/admin/cstat_search.tpl');
 
-    $datas=Array(
-      'dialogBox' => $this->dialogBoxColor(),
-      'themeName' => $template->get_themeconf('name'),
-    );
-
-    $template->assign('datas', $datas);
+    $template->assign('cstat_search_page', GPCRequestBuilder::displaySearchPage());
 
     $template->assign_var_from_handle('CSTAT_BODY_PAGE', 'body_page');
@@ -297 +293 @@
   {
     global $template, $lang;
+
+    $configTabs=new GPCTabSheet('configTabsheet', $this->tabsheet->get_titlename(), 'tabsheet2 gcBorder', 'itab2');
+    $configTabs->add('database',
+                      l10n('cstat_database'),
+                      '', true, "displayConfig('database');");
+    $configTabs->add('statsearch',
+                      l10n('cstat_stat_and_search'),
+                      '', false, "displayConfig('statsearch');");
+    $configTabs->add('display',
+                      l10n('cstat_gallery_integration'),
+                      '', false, "displayConfig('display');");
+    $configTabs->assign();
 
     $template->set_filename('body_page',
@@ -390 +398 @@
 
 
-  protected function getGeneralStats()
-  {
-    $returned=Array(
-      'nbImages' => 0,
-      'totalTime' => 0,
-      'pixelsAnalyzedMax' => 0,
-      'pixelsAnalyzedMin' => 0,
-      'pixelsAnalyzedAvg' => 0,
-      'pixelsAnalyzedSum' => 0,
-      'totalPixels' => 0,
-      'ppsMax' => 0,
-      'ppsMin' => 0,
-      'ppsAvg' => 0,
-      'qualityMax' => 0,
-      'qualityMin' => 0,
-      'qualityAvg' => 0,
-    );
-    $sql="SELECT COUNT(image_id) AS nbImages,
-                 SUM(time) AS totalTime,
-                 MAX(analyzed_pixels) AS pixelsAnalyzedMax,
-                 MIN(analyzed_pixels) AS pixelsAnalyzedMin,
-                 AVG(analyzed_pixels) AS pixelsAnalyzedAvg,
-                 SUM(analyzed_pixels) AS pixelsAnalyzedSum,
-                 SUM(num_pixels) AS totalPixels,
-                 MAX(pps) AS ppsMax,
-                 MIN(pps) AS ppsMin,
-                 AVG(pps) AS ppsAvg,
-                 MAX(quality) AS qualityMax,
-                 MIN(quality) AS qualityMin,
-                 AVG(quality) AS qualityAvg
-          FROM ".$this->tables['images']."
-          WHERE analyzed='y';";
-    $result=pwg_query($sql);
-    if($result)
-    {
-      while($row=pwg_db_fetch_assoc($result))
-      {
-        $returned=$row;
-      }
-    }
-    return($returned);
-  }
-
-
   /**
    * make consolidation for the color_table :
@@ -626 +590 @@
       {
         $colorTable=ColorStat::getColorTable(
-          $this->colorTableSize[$this->config['analyze_colorTable']][0],
-          $this->colorTableSize[$this->config['analyze_colorTable']][1]
+          CStat_root::$colorTableSize[$this->config['analyze_colorTable']][0],
+          CStat_root::$colorTableSize[$this->config['analyze_colorTable']][1]
         );
 
@@ -688 +652 @@
                   dirname($this->getFileLocation()).'/admin/cstat_stat_show_iListColors.tpl');
 
-    $generalStats=$this->getGeneralStats();
+    $generalStats=CStat_functions::getGeneralStats();
 
     $sql="SELECT color_id, num_images, num_pixels