Changeset 2117

Timestamp:

Sep 7, 2011, 2:43:16 AM (9 years ago)

Author:

roux

Message:

adaptation ND

Location:

cpc/trunk/project

Files:

• apps/frontend/modules/plot/actions/components.class.php (modified) (2 diffs)
• apps/frontend/modules/plot/templates/_groupes.php (modified) (2 diffs)
• apps/frontend/modules/plot/templates/generatePlotGroupesSuccess.php (modified) (1 diff)
• bin/init (modified) (1 diff)
• lib/model/doctrine/myTools.class.php (modified) (1 diff)
• web/sfProtoculousPlugin (deleted)

cpc/trunk/project/apps/frontend/modules/plot/actions/components.class.php

@@ -158 +158 @@
       $this->type = "home";
     $this->data['groupes'] = array(); 
-    foreach (array_reverse(myTools::convertYamlToArray(sfConfig::get('app_groupes_actuels', ''))) as $gpe) 
+    $this->data['couleurs'] = array();
+    $colormap = myTools::getGroupesColorMap();
+    foreach (array_reverse(myTools::convertYamlToArray(sfConfig::get('app_groupes_actuels', ''))) as $gpe) {
       $this->data['groupes'][$gpe] = array(); 
+      $this->data['couleurs'][] = $colormap[$gpe];
+    }
     if ($this->type === "home")
       $this->data['titres'] = array("Députés", "Interventions", "Amendements", "Propositions", "Quest. Écrites");
@@ -224 +228 @@
     if (!isset($this->plot)) $this->plot = 'total';
     $this->labels = myTools::convertYamlToArray(sfConfig::get('app_groupes_actuels', '')); 
+    $this->couleurs = array();
+    $colormap = myTools::getGroupesColorMap();
+    foreach ($this->labels as $gpe)
+      $this->couleurs[] = $colormap[$gpe];
     $this->interventions = array();
     if ($this->plot == 'total') {

cpc/trunk/project/apps/frontend/modules/plot/templates/_groupes.php

@@ -62 +62 @@
 $Test->drawFilledRoundedRectangle(7,7,$xsize-7,$ysize-7,5,240,240,240);
 $Test->drawRoundedRectangle(5,5,$xsize-5,$ysize-5,5,230,230,230);
-$Test->setColorPalette(0,255,30,30);
-$Test->setColorPalette(1,255,50,190);
-$Test->setColorPalette(2,30,190,255);
-$Test->setColorPalette(3,30,30,200);
-$Test->setColorPalette(4,200,200,200);
-$Test->setColorPalette(5,240,240,240);
+$ct = 0;
+foreach ($couleurs as $col) if (preg_match('/^(\d+),(\d+),(\d+)$/', $col, $cols)) {
+  $Test->setColorPalette($ct,$cols[1],$cols[2],$cols[3]);
+  $ct++;
+}
 $Test->xsSetFontProperties("tahoma.ttf",7);
 if (isset($Data)) {
@@ -93 +92 @@
 $Test->xsSetFontProperties("tahoma.ttf",9);
 $Test->setColorPalette(0,255,255,255);
-$Test->setColorPalette(1,255,30,30);
-$Test->setColorPalette(2,255,50,190);
-$Test->setColorPalette(3,30,190,255);
-$Test->setColorPalette(4,30,30,200);
-$Test->setColorPalette(5,200,200,200);
-$Test->setColorPalette(6,255,255,255);
+$ct = 1;
+foreach ($couleurs as $col) if (preg_match('/^(\d+),(\d+),(\d+)$/', $col, $cols)) {
+  $Test->setColorPalette($ct,$cols[1],$cols[2],$cols[3]);
+  $ct++;
+}
 $Test->drawFilledRoundedRectangle(15,$ylegend-14,72,$ylegend+5,5,255,255,255);
 $Test->drawLegend(15,$ylegend,$DataDescrLegend,255,255,255);

cpc/trunk/project/apps/frontend/modules/plot/templates/generatePlotGroupesSuccess.php

@@ -63 +63 @@
 }
 $Test->drawGrid(4,TRUE,0,0,0,30);
-$Test->setColorPalette(0,30,30,200);
-$Test->setColorPalette(1,30,190,255);
-$Test->setColorPalette(2,255,50,190);
-$Test->setColorPalette(3,255,30,30);
-$Test->setColorPalette(4,130,130,130);
+$ct = 0;
+foreach ($data['couleurs'] as $col) if (preg_match('/^(\d+),(\d+),(\d+)$/', $col, $cols)) {
+  $Test->setColorPalette($ct,$cols[1],$cols[2],$cols[3]);
+  $ct++;
+}
 $Test->setImageMap(TRUE,$mapId);
 $Test->drawStackedBarGraph($Data,$DataDescr,75,90);

cpc/trunk/project/bin/init

@@ -3 +3 @@
 mkdir log cache
 chmod 777 log cache
+cp config/app.yml{.example,}
 cp config/ProjectConfiguration.class{.example,}.php
 cp config/databases.yml{.example,}
-echo "Don't forget to adapt the configuration files : config/ProjectConfiguration.class.php config/databases.yml"
+cp bin/db.inc{.example,}
+echo "Don't forget to adapt the configuration files : bin/db.inc config/ProjectConfiguration.class.php config/databases.yml config/app.yml"

cpc/trunk/project/lib/model/doctrine/myTools.class.php

@@ -31 +31 @@
       $gpes[] = $map[$gpe];
     return $gpes;
+  }
+
+  public static function getGroupesColorMap() {
+    $colormap = array();
+    foreach (myTools::getGroupesInfos() as $gpe)
+      $colormap[$gpe[1]] = $gpe[2];
+    return $colormap;
   }