Changeset 59233 in spip-zone

Timestamp:

Mar 12, 2012, 9:45:35 AM (8 years ago)

Author:

m.dulondel@…

Message:

 

File:

• _plugins_/hydraulic/branches/v0.3/formulaires/lechapt_calmon.php (modified) (4 diffs)

_plugins_/hydraulic/branches/v0.3/formulaires/lechapt_calmon.php

@@ -270 +270 @@
         switch($ValCal){
                 case 'Q':
-                        if($L != 0 && $Lg != 0 && $M != 0){
+                        if($L != 0 && $M != 0 && ($Lg != 0 || $min != 0)){                      
                                 for($i = $min; $i <= $max; $i+= $pas){
                                         $result[] = pow(((($J*pow($D, $N))/$L)*(1000/$Lg)), 1/$M);
@@ -282 +282 @@
                 
                 case 'D': 
-                        if($J != 0 && $N != 0){
+                        if(($J != 0 || $min != 0) && $N != 0){
                                 for($i = $min; $i <= $max; $i+= $pas){
                                         $result[] = pow(((($L*pow($Q, $M))/$J)*($Lg/1000)), 1/$N);
@@ -294 +294 @@
                 
                 case 'J':
-                        if($D != 0){
+                        if($D != 0 || $min != 0){
                                 for($i = $min; $i <= $max; $i+= $pas){
                                         $result[] = (($L*pow($Q, $M))/pow($D, $N))*($Lg/1000) ;
@@ -306 +306 @@
                 
                 case 'Lg':
-                        if($L*pow($Q,$M) != 0){
+                        if($L != 0 && ($Q != 0 || $min != 0)){
                                 for($i = $min; $i <= $max; $i+= $pas){
                                         $result[] = (($J*pow($D, $N))/($L*pow($Q,$M)))*1000 ;