Changeset 2683

Timestamp:

09/30/10 08:22:11 (12 years ago)

Author:

Tomtom33

Message:

lunarPhase 1.1-RC1:

• Added new calc method more accurate for moon phases
• Added few information

Location:

plugins/lunarPhase/trunk

Files:

• _define.php (modified) (2 diffs)
• _prepend.php (modified) (2 diffs)
• _public.php (modified) (3 diffs)
• _widgets.php (modified) (2 diffs)
• img/light.png (deleted)
• inc/class.lunarphase.php (modified) (2 diffs)
• locales/fr/main.po (modified) (1 diff)
• style.css (modified) (2 diffs)

plugins/lunarPhase/trunk/_define.php

@@ -3 +3 @@
 # This file is part of lunarPhase, a plugin for Dotclear.
 # 
-# Copyright (c) 2009 Tomtom
+# Copyright (c) 2009-2010 Tomtom
 # http://blog.zenstyle.fr/
 # 
@@ -16 +16 @@
           /* Name */               'lunarPhase',
           /* Description */        'Display the moon phases',
-          /* Author */             'Tomtom (http://plugins.zenstyle.fr)',
-          /* Verion */             '1.0.5',
+          /* Author */             'Tomtom (http://blog.zenstyle.fr)',
+          /* Verion */             '1.1-RC1',
           /* Premission */         'usage,contentadmin'
 );

plugins/lunarPhase/trunk/_prepend.php

@@ -3 +3 @@
 # This file is part of lunarPhase, a plugin for Dotclear.
 # 
-# Copyright (c) 2009 Tomtom
+# Copyright (c) 2009-2010 Tomtom
 # http://blog.zenstyle.fr/
 # 
@@ -11 +11 @@
 # -- END LICENSE BLOCK ------------------------------------
 
+if (!defined('DC_RC_PATH')) { return; }
+
 $__autoload['lunarPhase'] = dirname(__FILE__).'/inc/class.lunarphase.php';
 

plugins/lunarPhase/trunk/_public.php

@@ -3 +3 @@
 # This file is part of lunarPhase, a plugin for Dotclear.
 # 
-# Copyright (c) 2009 Tomtom
+# Copyright (c) 2009-2010 Tomtom
 # http://blog.zenstyle.fr/
 # 
@@ -18 +18 @@
 {
      /**
-      * This function add CSS file in the public header
-      */
+     This function add CSS file in the public header
+     */
      public static function addCss()
      {
           global $core;
-
-          $url = $core->blog->url.'pf='.basename(dirname(__FILE__)).'/style.css';
+          
+          $url = $core->blog->getQMarkURL().'pf='.basename(dirname(__FILE__)).'/style.css';
           
           echo '<link rel="stylesheet" media="screen" type="text/css" href="'.$url.'" />';
@@ -33 +33 @@
 {
      /**
-      * Displays lunarphase widget
-      *
-      * @param object    w
-      *
-      * @return     string
-      */
+     Displays lunarphase widget
+     
+     @param    object    w
+     @return   string
+     */
      public static function widget($w)
      {
           global $core;
-
-          $lp = new lunarPhase($core,$w);
-
+          
+          $lp = new lunarPhase();
+          
+          $ul_mask = '<ul class="%2$s">%1$s</ul>';
+          $li_mask = '<li class="%2$s">%1$s</li>';
+          
           if ($w->homeonly && $core->url->type != 'default') {
                return;
           }
-
+          
           $res = strlen($w->title) > 0 ? '<h2>'.$w->title.'</h2>' : '';
-
-          $res .=
-               '<h3>'.__('In live').'</h3>'.
-               '<ul class="lunarphase">'.
-               lunarPhasePublic::setLine($lp->getPhase(),$w,'live').
-               '</ul>'.
-               '<h3>'.__('Previsions').'</h3>'.
-               '<ul class="lunarphase">';
-          foreach ($lp->getPrevisions() as $prevision) {
-               $mode = (!strpos($prevision->id,'moon')) ? 'illumination' : 'previsions';
-               $res .= lunarPhasePublic::setLine($prevision,$w,$mode);
-          }
-          $res .=
-               '</ul>'.
-               '</div>';
-
-          return 
+          
+          # Get live content
+          $res .= lunarPhasePublic::getLive($w,$lp);
+          # Get prevision content
+          $res .= lunarPhasePublic::getPrevisions($w,$lp);
+               
+          return
                '<div id="lunarphase">'.
                $res.
                '</div>';
      }
-
-     /**
-      * Returns each line of the item list
-      *
-      * @param object    obj
-      * @param object    w
-      * @param string    mode
-      *
-      * @return     string
-      */
-     public static function setLine($obj,$w,$mode)
+     
+     public static function getLive($w,$lp)
      {
-          $item = '<li class="%1$s">%2$s</li>'."\n";
-          $str = preg_replace(array('/%days%/','/%date%/'),array('%1$s','%2$s'),$w->{$obj->id});
+          $ul_mask = '<ul class="%2$s">%1$s</ul>';
+          $li_mask = '<li class="%2$s">%1$s</li>';
+          $live = $lp->getLive();
+          $res = '';
           
-          if ($mode == 'previsions') {
-               $text = sprintf($str,$obj->days,$obj->date);
+          # Phase
+          if ($w->phase) {
+               $res .= sprintf($li_mask,$live['name'],$live['id']);
           }
-          elseif ($mode == 'illumination') {
-               $text = sprintf($w->{$obj->id},$obj->value);
+          # Illumination
+          if ($w->illumination) {
+               $res .=
+               sprintf($li_mask,sprintf(__('Illumination: %s%%'),
+               lunarPhasePublic::formatValue('percent',$live['illumination'])),
+               'illumination');
           }
-          elseif ($mode == 'live') {
-               $text = $obj->name;
+          # Moon's age
+          if ($w->age) {
+               $res .=
+               sprintf($li_mask,sprintf(__('Age of moon: %s days'),
+               lunarPhasePublic::formatValue('int',$live['age'])),
+               'age');
           }
-          else {
-               $text = '';
+          # Distance from earth
+          if ($w->dist_to_earth) {
+               $res .=
+               sprintf($li_mask,sprintf(__('Distance to earth: %s km'),
+               lunarPhasePublic::formatValue('int',$live['dist_to_earth'])),
+               'dist_to_earth');
+          }         
+          # Distance from sun
+          if ($w->dist_to_sun) {
+               $res .=
+               sprintf($li_mask,sprintf(__('Distance to sun: %s km'),
+               lunarPhasePublic::formatValue('int',$live['dist_to_sun'])),
+               'dist_to_sun');
           }
-
-          return !empty($text) ? sprintf($item,$obj->id,$text) : '';
+          # Moon's angle
+          if ($w->moon_angle) {
+               $res .=
+               sprintf($li_mask,sprintf(__('Angle of moon: %s deg'),
+               lunarPhasePublic::formatValue('deg',$live['moon_angle'])),
+               'moon_angle');
+          }
+          # Sun's angle
+          if ($w->sun_angle) {
+               $res .=
+               sprintf($li_mask,sprintf(__('Angle of sun: %s deg'),
+               lunarPhasePublic::formatValue('deg',$live['sun_angle'])),
+               'sun_angle');
+          }
+          # Parallax
+          if ($w->parallax) {
+               $res .=
+               sprintf($li_mask,sprintf(__('Parallax: %s deg'),
+               lunarPhasePublic::formatValue('deg',$live['parallax'])),
+               'parallax');
+          }
+          
+          if (strlen($res) > 0) {
+               return
+               '<h3>'.__('In live').'</h3>'.
+               sprintf($ul_mask,$res,'lunarphase');
+          }
+     }
+     
+     public static function getPrevisions($w,$lp)
+     {
+          $ul_mask = '<ul class="%2$s">%1$s</ul>';
+          $li_mask = '<li class="%2$s">%1$s</li>';
+          $res = '';
+          
+          if ($w->previsions) {
+               foreach ($lp->getPrevisions() as $k => $v) {
+                    $res .= sprintf($li_mask,lunarPhasePublic::formatValue('date',$v),$k);
+               }
+          }
+          
+          if (strlen($res) > 0) {
+               return
+               '<h3>'.__('Previsions').'</h3>'.
+               sprintf($ul_mask,$res,'lunarphase');
+          }
+     }
+     
+     public static function formatValue($type = '',$value)
+     {
+          $res = '';
+          $format = $GLOBALS['core']->blog->settings->system->date_format.' - ';
+          $format .= $GLOBALS['core']->blog->settings->system->time_format;
+          
+          switch ($type) {
+               case 'int':
+                    $res = number_format($value,0);
+                    break;
+               case 'float':
+                    $res = number_format($value,2);
+                    break;
+               case 'percent':
+                    $res = number_format($value * 100,0);
+                    break;
+               case 'date':
+                    $res = dt::str($format,$value);
+                    break;
+               case 'deg':
+                    $res = number_format(($value * (180.0 / M_PI)),2);
+                    break;
+               default:
+                    $res = $value;
+                    break;
+          }
+          
+          return $res;
      }
 }

plugins/lunarPhase/trunk/_widgets.php

@@ -3 +3 @@
 # This file is part of lunarPhase, a plugin for Dotclear.
 # 
-# Copyright (c) 2009 Tomtom
+# Copyright (c) 2009-2010 Tomtom
 # http://blog.zenstyle.fr/
 # 
@@ -17 +17 @@
 class lunarPhaseWidgets
 {
-     /**
-      * This function create a new lunarPhase widget
-      *
-      * @param object    w
-      */
      public static function initWidgets($w)
      {
           $w->create('lunarphase',__('Moon phases'),array('lunarPhasePublic','widget'));
           $w->lunarphase->setting('title',__('Title:'),__('Moon phases'));
-          $w->lunarphase->setting('new_moon',__('Text for new moon:'),__('New moon in %days% day(s) - %date%'));
-          $w->lunarphase->setting('first_quarter_moon',__('Text for first quarter:'),__('First Quarter in %days% day(s) - %date%'));
-          $w->lunarphase->setting('full_moon',__('Text for full moon:'),__('Full moon in %days% day(s) - %date%'));
-          $w->lunarphase->setting('last_quarter_moon',__('Text for last quarter:'),__('Last Quarter in %days% day(s) - %date%'));
-          $w->lunarphase->setting('illumination',__('Text for illumination:'),__('Illumination : %s %%'));
-          $w->lunarphase->setting('format_date',__('format date (leave blank to use Dotclear date format):'),'');
+          $w->lunarphase->setting('phase',__('Display actual phase of moon'),1,'check');
+          $w->lunarphase->setting('illumination',__('Display actual illumination of moon'),1,'check');
+          $w->lunarphase->setting('age',__('Display actual age of moon'),1,'check');
+          $w->lunarphase->setting('dist_to_earth',__('Display actual distance between moon and earth'),1,'check');
+          $w->lunarphase->setting('dist_to_sun',__('Display actual distance between moon and sun'),1,'check');
+          $w->lunarphase->setting('moon_angle',__('Display actual angle of moon'),1,'check');
+          $w->lunarphase->setting('sun_angle',__('Display actual angle of sun'),1,'check');
+          $w->lunarphase->setting('parallax',__('Display actual parallax of moon'),1,'check');
+          $w->lunarphase->setting('previsions',__('Display all previsions for the next moon phases'),1,'check');
           $w->lunarphase->setting('homeonly',__('Home page only'),1,'check');
      }

plugins/lunarPhase/trunk/inc/class.lunarphase.php

@@ -3 +3 @@
 # This file is part of lunarPhase, a plugin for Dotclear.
 # 
-# Copyright (c) 2009 Tomtom
+# Copyright (c) 2009-2010 Tomtom
 # http://blog.zenstyle.fr/
 # 
@@ -13 +13 @@
 class lunarPhase
 {
-     protected $phase;
+     # Astronomical constants.
+     const epoch         = 2444238.5;                                 # 1980 January 0.0
+
+     # Constants defining the Sun's apparent orbit.
+     const elonge        = 278.833540;                                # ecliptic longitude of the Sun at epoch 1980.0
+     const elongp        = 282.596403;                                # ecliptic longitude of the Sun at perigee
+     const eccent        = 0.016718;                                  # eccentricity of Earth's orbit
+     const sunsMax       = 1.495985e8;                                # semi-major axis of Earth's orbit, km
+     const sunAngSiz     = 0.533128;                                  # sun's angular size, degrees, at semi-major axis distance
+
+     # Elements of the Moon's orbit, epoch 1980.0.
+     const mmLong        = 64.975464;                                 # moon's mean longitude at the epoch
+     const mmLongp       = 349.383063;                                # mean longitude of the perigee at the epoch
+     const mlNode        = 151.950429;                                # mean longitude of the node at the epoch
+     const mInc          = 5.145396;                                  # inclination of the Moon's orbit
+     const mEcc          = 0.054900;                                  # eccentricity of the Moon's orbit
+     const mAngSiz       = 0.5181;                                    # moon's angular size at distance a from Earth
+     const msMax         = 384401.0;                                  # semi-major axis of Moon's orbit in km
+     const mParallax     = 0.9507;                                    # parallax at distance a from Earth
+     const synodic       = 29.53058868;                               # synodic month (new Moon to new Moon)
+     
+     protected $live;
      protected $previsions;
-     protected $references;
-
-     /**
-      * Constructor of the class... What else? (Yes, i drink Nespresso ;))
-      */
-     public function __construct($core,$w)
+     
+     public function __construct()
      {
-          $this->core =& $core;
-          $this->w    =& $w;
-
-          $this->setReferences();
-          $this->setPhase();
+          $this->live = new ArrayObject;
+          $this->previsions = new ArrayObject;
+          
+          $this->setLive();
           $this->setPrevisions();
      }
-
-     public function getPhase()
+     
+     public function getLive()
      {
-          return $this->phase;
+          return $this->live;
      }
-
+     
      public function getPrevisions()
      {
           return $this->previsions;
      }
-
-     /**
-      * Calculates and defines the current moon phase
-      */
+     
+     private function setLive()
+     {
+          $day = $this->jTime(time()) - self::epoch;
+          
+          # Calculate sun's position and angle
+          $N = $this->fixAngle((360 / 365.2422) * $day);
+          $M = $this->fixAngle($N + self::elonge - self::elongp);
+          $Ec = $this->kepler($M, self::eccent);
+          $Ec = sqrt((1 + self::eccent) / (1 - self::eccent)) * tan($Ec / 2);
+          $Ec = 2 * $this->toDeg(atan($Ec));
+          $lambdaSun = $this->fixAngle($Ec + self::elongp);
+          $F = ((1 + self::eccent * cos($this->toRad($Ec))) / (1 - self::eccent * self::eccent));
+          
+          # Calculate moon's age, position and angle
+          $ml = $this->fixAngle(13.1763966 * $day + self::mmLong);
+          $MM = $this->fixAngle($ml - 0.1114041 * $day - self::mmLongp);
+          $MN = $this->fixAngle(self::mlNode - 0.0529539 * $day);
+          $Ev = 1.2739 * sin($this->toRad(2 * ($ml - $lambdaSun) - $MM));
+          $Ae = 0.1858 * sin($this->toRad($M));
+          $A3 = 0.37 * sin($this->toRad($M));
+          $MmP = $MM + $Ev - $Ae - $A3;
+          $mEc = 6.2886 * sin($this->toRad($MmP));
+          $A4 = 0.214 * sin($this->toRad(2 * $MmP));
+          $lP = $ml + $Ev + $mEc - $Ae + $A4;
+          $V = 0.6583 * sin($this->toRad(2 * ($lP - $lambdaSun)));
+          $lPP = $lP + $V;
+          $NP = $MN - 0.16 * sin($this->toRad($M));
+          $y = sin($this->toRad($lPP - $NP)) * cos($this->toRad(self::mInc));
+          $x = cos($this->toRad($lPP - $NP));
+          $lambdaMoon = $this->toDeg(atan2($y, $x));
+          $lambdaMoon += $NP;
+          $mage = $lPP - $lambdaSun;
+          $BetaM = $this->toDeg(asin(sin($this->toRad($lPP - $NP)) * sin($this->toRad(self::mInc))));
+          
+          $this->live['illumination']   = (1 - cos($this->toRad($mage))) / 2;
+          $this->live['age']            = self::synodic * ($this->fixAngle($mage) / 360.0); 
+          $this->live['dist_to_earth']  = (self::msMax * (1 - self::mEcc * self::mEcc)) / (1 + self::mEcc * cos($this->toRad($MmP + $mEc)));
+          $this->live['dist_to_sun']    = self::sunsMax / $F;
+          $this->live['sun_angle']      = $F * self::sunAngSiz;
+          $this->live['moon_angle']     = self::mAngSiz / ($this->live['dist_to_earth'] / self::msMax);
+          $this->live['parallax']  = self::mParallax / ($this->live['dist_to_earth'] / self::msMax);
+          
+          $this->setPhase();
+     }
+     
      private function setPhase()
      {
-          $ts = time() - $this->references->new_moon;
-
-          $this->phase = new stdClass();
-          $this->phase->value = abs(($ts % $this->references->day_in_sec) / $this->references->day_in_sec);
-
-          if ($this->phase->value >= 0.474 && $this->phase->value <= 0.53) {
-               $this->phase->id = 'new_moon';
-               $this->phase->name = __('New moon');
+          if ($this->live['age'] >= self::synodic && $this->live['age'] <= self::synodic/8) {
+               $this->live['id'] = 'new_moon';
+               $this->live['name'] = __('New moon');
           }
-          elseif ($this->phase->value >= 0.53 && $this->phase->value <= 0.724) {
-               $this->phase->id = 'waxing_crescent_moon';
-               $this->phase->name = __('Waxing crescent moon');
+          elseif ($this->live['age'] >= self::synodic/8 && $this->live['age'] <= self::synodic/4) { 
+               $this->live['id'] = 'waxing_crescent_moon';
+               $this->live['name'] = __('Waxing crescent moon');
           }
-          elseif ($this->phase->value >= 0.724 && $this->phase->value <= 0.776) {
-               $this->phase->id = 'first_quarter_moon';
-               $this->phase->name = __('First quarter moon');
+          elseif ($this->live['age'] >= self::synodic/4 && $this->live['age'] <= self::synodic*3/8) {
+               $this->live['id'] = 'first_quarter_moon';
+               $this->live['name'] = __('First quarter moon');
           }
-          elseif ($this->phase->value >= 0.776 && $this->phase->value <= 0.974) {
-               $this->phase->id = 'waxing_gibbous_moon';
-               $this->phase->name = __('Waxing gibbous moon');
+          elseif ($this->live['age'] >= self::synodic*3/8 && $this->live['age'] <= self::synodic/2) {
+               $this->live['id'] = 'waxing_gibbous_moon';
+               $this->live['name'] = __('Waxing gibbous moon');
           }
-          elseif ($this->phase->value >= 0.974 || $this->phase->value <= 0.026) {
-               $this->phase->id = 'full_moon';
-               $this->phase->name = __('Full moon');
+          elseif ($this->live['age'] >= self::synodic/2 && $this->live['age'] <= self::synodic*5/8) {
+               $this->live['id'] = 'full_moon';
+               $this->live['name'] = __('Full moon');
           }
-          elseif ($this->phase->value >= 0.026 && $this->phase->value <= 0.234) {
-               $this->phase->id = 'waning_gibbous_moon';
-               $this->phase->name = __('Waning gibbous moon');
+          elseif ($this->live['age'] >= self::synodic*5/8 && $this->live['age'] <= self::synodic*3/4) {
+               $this->live['id'] = 'waning_gibbous_moon';
+               $this->live['name'] = __('Waning gibbous moon');
           }
-          elseif ($this->phase->value >= 0.234 && $this->phase->value <= 0.295) {
-               $this->phase->id = 'last_quarter_moon';
-               $this->phase->name = __('Last quarter moon');
+          elseif ($this->live['age'] >= self::synodic*3/4 && $this->live['age'] <= self::synodic*7/8) {
+               $this->live['id'] = 'last_quarter_moon';
+               $this->live['name'] = __('Last quarter moon');
           }
-          elseif ($this->phase->value >= 0.295 && $this->phase->value <= 0.4739) {
-               $this->phase->id = 'waning_crescent_moon';
-               $this->phase->name = __('Waning crescent moon');
+          elseif ($this->live['age'] >= self::synodic*7/8 && $this->live['age'] <= self::synodic/8) {
+               $this->live['id'] = 'waning_crescent_moon';
+               $this->live['name'] = __('Waning crescent moon');
           }
      }
-
-     /**
-      * Calculates all other previsions
-      */
+     
      private function setPrevisions()
      {
-          $this->previsions = new stdClass();
-
-          $this->calcNewMoon();
-          $this->calcFirstQuarterMoon();
-          $this->calcFullMoon();
-          $this->calcLastQuarterMoon();
-          $this->calcIllumination();
+          $ts_day = 24*60*60;
+          $ts_synodic = self::synodic * $ts_day;
+          $start = time() - $this->live['age'] * $ts_day;
+          
+          $this->previsions = new ArrayObject;
+          $this->previsions['waxing_crescent_moon'] = $start + $ts_synodic / 8;
+          $this->previsions['first_quarter_moon'] = $start + $ts_synodic / 4;
+          $this->previsions['waxing_gibbous_moon'] = $start + $ts_synodic * 3 / 8;
+          $this->previsions['full_moon'] = $start + $ts_synodic / 2;
+          $this->previsions['waning_gibbous_moon'] = $start + $ts_synodic * 5 / 8;
+          $this->previsions['last_quarter_moon'] = $start + $ts_synodic * 3 / 4;
+          $this->previsions['waning_crescent_moon'] = $start + $ts_synodic * 7 / 8;
+          $this->previsions['new_moon'] = $start + $ts_synodic;
+          
      }
-
-     /**
-      * Defines references for the plugin
-      */
-     private function setReferences()
+     
+     private function fixAngle($x)
      {
-          $this->references = new stdClass();
-
-          $this->references->synodic_moon = (1/((1/27.322)-(1/365.25)))*24*60*60;
-          $this->references->new_moon = mktime(6,39,0,2,16,1999);
-          $this->references->day_in_sec = 60*60*24;
+          return ($x - 360.0 * (floor($x / 360.0)));
      }
-
-     /**
-      * Calculates the next new moon
-      */
-     private function calcNewMoon()
+     
+     private function toRad($x)
      {
-          if ($this->phase->value < 0.5) {
-               $ts = (0.5 - $this->phase->value) * $this->references->synodic_moon;
+          return ($x * (M_PI / 180.0));
+     }
+     
+     private function toDeg($x)
+     {
+          return ($x * (180.0 / M_PI));
+     }
+     
+     private function jTime($t)
+     {
+          return ($t / 86400) + 2440587.5;
+     }
+     
+     private function kepler($m, $ecc)
+     {
+          $delta = null;
+          $EPSILON = 1e-6;
+          
+          $m = $this->toRad($m);
+          $e = $m;
+          while (abs($delta) > $EPSILON)
+          {
+               $delta = $e - $ecc * sin($e) - $m;
+               $e -= $delta / (1 - $ecc * cos($e));
           }
-          elseif ($this->phase->value >= 0.5) {
-               $ts = (1.5 - $this->phase->value) * $this->references->synodic_moon;
-          }
-
-          $this->previsions->new_moon = new stdClass();
-          $this->previsions->new_moon->id = 'new_moon';
-          $this->previsions->new_moon->days = $this->tsToDays($ts);
-          $this->previsions->new_moon->date = $this->tsToDate($ts);
-     }
-
-     /**
-      * Calculates the next first quarter moon
-      */
-     private function calcFirstQuarterMoon()
-     {
-          if ($this->phase->value < 0.75) {
-               $ts = (0.75 - $this->phase->value) * $this->references->synodic_moon;
-          }
-          elseif ($this->phase->value >= 0.75) {
-               $ts = (1.75 - $this->phase->value) * $this->references->synodic_moon;
-          }
-
-          $this->previsions->first_quarter_moon = new stdClass();
-          $this->previsions->first_quarter_moon->id = 'first_quarter_moon';
-          $this->previsions->first_quarter_moon->days = $this->tsToDays($ts);
-          $this->previsions->first_quarter_moon->date = $this->tsToDate($ts);
-     }
-
-     /**
-      * Calculates the next fulle moon
-      */
-     private function calcFullMoon()
-     {
-          $ts = (1 - $this->phase->value) * $this->references->synodic_moon;
-     
-          $this->previsions->full_moon = new stdClass();
-          $this->previsions->full_moon->id = 'full_moon';
-          $this->previsions->full_moon->days = $this->tsToDays($ts);
-          $this->previsions->full_moon->date = $this->tsToDate($ts);
-     }
-
-     /**
-      * Calculates the next last quarter moon
-      */
-     private function calcLastQuarterMoon()
-     {
-          if ($this->phase->value < 0.25) {
-               $ts = (0.25 - $this->phase->value) * $this->references->synodic_moon;
-          }
-          elseif ($this->phase->value >= 0.25) {
-               $ts = (1.25 - $this->phase->value) * $this->references->synodic_moon;
-          }
-
-          $this->previsions->last_quarter_moon = new stdClass();
-          $this->previsions->last_quarter_moon->id = 'last_quarter_moon';
-          $this->previsions->last_quarter_moon->days = $this->tsToDays($ts);
-          $this->previsions->last_quarter_moon->date = $this->tsToDate($ts);
-     }
-
-     /**
-      * Calculates the current illumination of the moon
-      */
-     private function calcIllumination()
-     {
-          $this->previsions->illumination = new stdClass();
-          $this->previsions->illumination->id = 'illumination';
-          $this->previsions->illumination->value = round(((1.0 + cos(2.0 * M_PI * $this->phase->value)) / 2.0) * 100,1);
-     }
-
-     /**
-      * Returns date according to the timestamp in argument
-      *
-      * @param timestamp ts
-      *
-      * @return     timestamp
-      */
-     private function tsToDate($ts)
-     {
-          $format = !empty($this->w->format_date) ? $this->w->format_date : $this->core->blog->settings->date_format;
-
-          return dt::str($format,$ts + time());
-     }
-
-     /**
-      * Return the time passed an argument converting in days
-      *
-      * @param time ts
-      *
-      * @return     float
-      */
-     private function tsToDays($ts)
-     {
-          return round($ts / $this->references->day_in_sec,1);
+          return ($e);
      }
 }

plugins/lunarPhase/trunk/locales/fr/main.po

@@ -1 @@
-# Français translation of lunarPhase, a plugin for dotclear
-# This file is generated by LangOmatic, a plugin for Dotclear
+# Language: Français
+# Module: lunarPhase - 1.1
+# Date: 2010-09-30 06:18:51
+# Translated with translater 1.5
+
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: \n"
+"Project-Id-Version: lunarPhase 1.1\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: Kozlika <kozlika@free.fr>\n"
+"PO-Revision-Date: 2010-09-30T06:18:51+00:00\n"
+"Last-Translator: Thomas Bouron\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _widgets.php:28
-#: _widgets.php:29
+#: _public.php:80
+msgid "Illumination: %s%%"
+msgstr "Illumination %s%%"
+
+#: _public.php:87
+msgid "Age of moon: %s days"
+msgstr "Age de la lune: %s jours"
+
+#: _public.php:94
+msgid "Distance to earth: %s km"
+msgstr "Distance à la terre: %s km"
+
+#: _public.php:101
+msgid "Distance to sun: %s km"
+msgstr "Distance au soleil: %s km"
+
+#: _public.php:108
+msgid "Angle of moon: %s deg"
+msgstr "Angle de la lune: %s deg"
+
+#: _public.php:115
+msgid "Angle of sun: %s deg"
+msgstr "Angle du soleil: %s deg"
+
+#: _public.php:122
+msgid "Parallax: %s deg"
+msgstr "Parallaxe: %s deg"
+
+#: _public.php:129
+msgid "In live"
+msgstr "En direct"
+
+#: _public.php:148
+msgid "Previsions"
+msgstr "Prévisions"
+
+#: _widgets.php:21
+#: _widgets.php:22
 msgid "Moon phases"
 msgstr "Phases lunaires"
 
-#: _widgets.php:30
-msgid "Text for new moon:"
-msgstr "Texte pour la nouvelle lune :"
+#: _widgets.php:23
+msgid "Display actual phase of moon"
+msgstr "Afficher la phase lunaire actuelle"
+
+#: _widgets.php:24
+msgid "Display actual illumination of moon"
+msgstr "Afficher le taux d'illumination actuel de la lune"
+
+#: _widgets.php:25
+msgid "Display actual age of moon"
+msgstr "Afficher l'age actuel de la lune"
+
+#: _widgets.php:26
+msgid "Display actual distance between moon and earth"
+msgstr "Afficher la distance actuelle entre la terre et la lune"
+
+#: _widgets.php:27
+msgid "Display actual distance between moon and sun"
+msgstr "Afficher la distance actuelle entre le soleil et la lune"
+
+#: _widgets.php:28
+msgid "Display actual angle of moon"
+msgstr "Afficher l'angle actuel de la lune"
+
+#: _widgets.php:29
+msgid "Display actual angle of sun"
+msgstr "Afficher l'angle actuel du soleil"
 
 #: _widgets.php:30
-msgid "New moon in %days% day(s) - %date%"
-msgstr "Nouvelle lune dans %days% jour(s) - %date%"
+msgid "Display actual parallax of moon"
+msgstr "Afficher la parallaxe actuelle de la lune"
 
 #: _widgets.php:31
-msgid "Text for first quarter:"
-msgstr "Texte pour le premier quartier :"
+msgid "Display all previsions for the next moon phases"
+msgstr "Afficher toutes les prévisions des prochaines lunaisons"
 
-#: _widgets.php:31
-msgid "First Quarter in %days% day(s) - %date%"
-msgstr "Premier quartier dans %days% jour(s) - %date%"
-
-#: _widgets.php:32
-msgid "Text for full moon:"
-msgstr "Texte pour la pleine lune :"
-
-#: _widgets.php:32
-msgid "Full moon in %days% day(s) - %date%"
-msgstr "Pleine lune dans %days% jour(s) - %date%"
-
-#: _widgets.php:33
-msgid "Text for last quarter:"
-msgstr "Texte pour le dernier quartier :"
-
-#: _widgets.php:33
-msgid "Last Quarter in %days% day(s) - %date%"
-msgstr "Dernier quartier dans %days% jour(s) - %date%"
-
-#: _widgets.php:34
-msgid "Text for illumination:"
-msgstr "Texte pour le pourcentage d'illlumination :"
-
-#: _widgets.php:34
-msgid "Illumination : %s %%"
-msgstr "Illumination %s %%"
-
-#: _widgets.php:35
-msgid "format date (leave blank to use Dotclear date format):"
-msgstr "Format de la date (laissez vide pour utiliser le format de Dotclear) :"
-
-#: inc/class.lunarphase.php:47
+#: inc/class.lunarphase.php:107
 msgid "New moon"
 msgstr "Nouvelle lune"
 
-#: inc/class.lunarphase.php:51
+#: inc/class.lunarphase.php:111
 msgid "Waxing crescent moon"
 msgstr "Lune croissante"
 
-#: inc/class.lunarphase.php:55
+#: inc/class.lunarphase.php:115
 msgid "First quarter moon"
 msgstr "Premier quartier"
 
-#: inc/class.lunarphase.php:59
+#: inc/class.lunarphase.php:119
 msgid "Waxing gibbous moon"
 msgstr "Lune gibbeuse croissante"
 
-#: inc/class.lunarphase.php:63
+#: inc/class.lunarphase.php:123
 msgid "Full moon"
 msgstr "Pleine lune"
 
-#: inc/class.lunarphase.php:67
+#: inc/class.lunarphase.php:127
 msgid "Waning gibbous moon"
 msgstr "Lune gibbeuse décroissante"
 
-#: inc/class.lunarphase.php:71
+#: inc/class.lunarphase.php:131
 msgid "Last quarter moon"
 msgstr "Dernier quartier"
 
-#: inc/class.lunarphase.php:75
+#: inc/class.lunarphase.php:135
 msgid "Waning crescent moon"
 msgstr "Lune décroissante"
 
-#: inc/lib.lunarphase.ui.php:66
-msgid "In live"
-msgstr "En direct"
-
-#: inc/lib.lunarphase.ui.php:70
-msgid "Previsions"
-msgstr "Prévisions"
-
-msgid "lunarPhase"
-msgstr "lunarPhase"
-

plugins/lunarPhase/trunk/style.css

@@ -3 +3 @@
 # This file is part of lunarPhase, a plugin for Dotclear.
 # 
-# Copyright (c) 2009 Tomtom
+# Copyright (c) 2009-2010 Tomtom
 # http://blog.zenstyle.fr/
 # 
@@ -11 +11 @@
 # -- END LICENSE BLOCK ------------------------------------
 */
-#sidebar ul.lunarphase li.new_moon {
+#lunarphase ul li.new_moon {
      background: transparent url(index.php?pf=lunarPhase/img/nm.gif) no-repeat left 0.2em;
      padding-left: 2em;
 }
-#sidebar ul.lunarphase li.waxing_crescent_moon {
+#lunarphase ul li.waxing_crescent_moon {
      background: transparent url(index.php?pf=lunarPhase/img/wcm1.gif) no-repeat left 0.2em;
      padding-left: 2em;
 }
-#sidebar ul.lunarphase li.first_quarter_moon {
+#lunarphase ul li.first_quarter_moon {
      background: transparent url(index.php?pf=lunarPhase/img/fqm.gif) no-repeat left 0.2em;
      padding-left: 2em;
 }
-#sidebar ul.lunarphase li.waxing_gibbous_moon {
+#lunarphase ul li.waxing_gibbous_moon {
      background: transparent url(index.php?pf=lunarPhase/img/wgm1.gif) no-repeat left 0.2em;
      padding-left: 2em;
 }
-#sidebar ul.lunarphase li.full_moon {
+#lunarphase ul li.full_moon {
      background: transparent url(index.php?pf=lunarPhase/img/fm.gif) no-repeat left 0.2em;
      padding-left: 2em;
 }
-#sidebar ul.lunarphase li.waning_gibbous_moon {
+#lunarphase ul li.waning_gibbous_moon {
      background: transparent url(index.php?pf=lunarPhase/img/wgm2.gif) no-repeat left 0.2em;
      padding-left: 2em;
 }
-#sidebar ul.lunarphase li.last_quarter_moon {
+#lunarphase ul li.last_quarter_moon {
      background: transparent url(index.php?pf=lunarPhase/img/tqm.gif) no-repeat left 0.2em;
      padding-left: 2em;
 }
-#sidebar ul.lunarphase li.waning_crescent_moon {
+#lunarphase ul li.waning_crescent_moon {
      background: transparent url(index.php?pf=lunarPhase/img/wcm2.gif) no-repeat left 0.2em;
      padding-left: 2em;
 }
-#sidebar ul.lunarphase li.illumination {
-     background: transparent url(index.php?pf=lunarPhase/img/light.png) no-repeat left 0.2em;
-     padding-left: 2em;
-}