Changeset 15346 for extensions/Histogram

Timestamp:

May 27, 2012, 2:06:02 PM (12 years ago)

Author:

grum

Message:

feature:2640 - Compatibility with Piwigo 2.4

Location:

extensions/Histogram

Files:

• admin.php (added)
• admin/plugin_admin.php (deleted)
• hgram_aip.class.inc.php (modified) (5 diffs)
• hgram_histogram.class.inc.php (modified) (3 diffs)
• hgram_version.inc.php (modified) (1 diff)
• js/histoLoad.min.js (deleted)
• main.inc.php (modified) (2 diffs)
• templates/hgram_picture_histo.tpl (modified) (1 diff)

extensions/Histogram/hgram_aip.class.inc.php

@@ -39 +39 @@
     $this->tabsheet->add('config',
                           l10n('hgram_config'),
-                          $this->getAdminLink()."&f_tabsheet=config");
+                          $this->getAdminLink()."-config");
   }
 
@@ -54 +54 @@
   {
     parent::initEvents();
-    if($_REQUEST['f_tabsheet']=='search')
+    if($_GET['tab']=='search')
     {
       // load request builder JS only on the search page
@@ -72 +72 @@
     $template->set_filename('plugin_admin_content', dirname(__FILE__)."/admin/hgram_admin.tpl");
 
-    switch($_REQUEST['f_tabsheet'])
+    switch($_GET['tab'])
     {
       case 'config':
@@ -79 +79 @@
     }
 
-    $this->tabsheet->select($_REQUEST['f_tabsheet']);
+    $this->tabsheet->select($_GET['tab']);
     $this->tabsheet->assign();
     $selected_tab=$this->tabsheet->get_selected();
@@ -97 +97 @@
   protected function checkRequest()
   {
-    if(!isset($_REQUEST['f_tabsheet'])) $_REQUEST['f_tabsheet']='config';
+    if(!isset($_GET['tab'])) $_GET['tab']='config';
 
-    if(!($_REQUEST['f_tabsheet']=='config')) $_REQUEST['f_tabsheet']='config';
+    if(!($_GET['tab']=='config')) $_GET['tab']='config';
   }
 

extensions/Histogram/hgram_histogram.class.inc.php

@@ -18 +18 @@
 if(!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
+define('MAX_PIXELS_ANALYZED', 1000000);
 
 
@@ -92 +93 @@
         $imageHeight=imagesy($image);
 
+
+        $ratio=1;
+        $nbPixels=$imageWidth*$imageHeight;
+        if($nbPixels>MAX_PIXELS_ANALYZED) $ratio=$nbPixels/MAX_PIXELS_ANALYZED;
+
+        $imageWorkWidth=round($imageWidth/$ratio,0);
+        $imageWorkHeight=round($imageHeight/$ratio,0);
+        $imageWork=imagecreatetruecolor($imageWorkWidth,$imageWorkHeight);
+        imagecopyresampled($imageWork, $image, 0, 0, 0, 0, $imageWorkWidth, $imageWorkHeight, $imageWidth, $imageHeight);
+        //imagecopyresized($imageWork, $image, 0, 0, 0, 0, $imageWorkWidth, $imageWorkHeight, $imageWidth, $imageHeight);
+        imagedestroy($image);
+
         $i=0;
-        for($px=0;$px<$imageWidth;$px++)
-        {
-          for($py=0;$py<$imageHeight;$py++)
+        for($px=0;$px<$imageWorkWidth;$px++)
+        {
+          for($py=0;$py<$imageWorkHeight;$py++)
           {
             $i++;
-            $value=imagecolorat($image, $px, $py);
+            $value=imagecolorat($imageWork, $px, $py);
 
             $rgb=self::IntToRGB($value);
@@ -116 +129 @@
         }
 
-        imagedestroy($image);
+        imagedestroy($imageWork);
 
         self::$fileHistogram=Array(
-          'pixels'   => $imageWidth*$imageHeight,
+          'pixels'   => $imageWorkWidth*$imageWorkHeight,
           'analyzed' => $i,
           'time'     => microtime(true)-$time,

extensions/Histogram/hgram_version.inc.php

@@ -15 +15 @@
   if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-  define('HGRAM_VERSION',  '0.1.1');
-  define('HGRAM_VERSION2', '00.01.01');
+  define('HGRAM_VERSION',  '0.2.0');
+  define('HGRAM_VERSION2', '00.02.00');
   define('HGRAM_GPC_NEEDED', '3.5.2');
 ?>

extensions/Histogram/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Histogram
-Version: 0.1.1
+Version: 0.2.0
 Description: Allow to make stat on pictures colors
 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=393
@@ -27 +27 @@
 |         |            |   . compatibility with Piwigo 2.2
 |         |            |
+| 0.2.0   | 2011/09/25 | * mantis feature:2640
+|         |            |   . compatibility with Piwigo 2.4
 |         |            |
 |         |            |

extensions/Histogram/templates/hgram_picture_histo.tpl

@@ -1 @@
-{combine_script id="jquery" path="themes/default/js/jquery.min.js"}
+{combine_script id="jquery" path="themes/default/js/jquery.js"}
 
 
 <div id='iHistoContent' style='text-align:center;'>
 {if $histoImg==''}
-  {combine_script id="histogram.histoLoad" path="plugins/Histogram/js/histoLoad.min.js" require="jquery"}
+  {combine_script id="histogram.histoLoad" path="plugins/Histogram/js/histoLoad.js" require="jquery"}
   <span id='iHistoTxt'>{'hgram_loading_histo'|@translate}</span>
   <script type='text/javascript'>