Popravki pri prikazu zunanjega hrupa

malamalca · Jul 23, 2024 · 6131b10 · 6131b10
1 parent 5bd7a26
commit 6131b10
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 19 deletions.
diff --git a/src/Calc/Hrup/UdarniHrup/UdarniHrupPoenostavljen.php b/src/Calc/Hrup/UdarniHrup/UdarniHrupPoenostavljen.php
@@ -165,7 +165,7 @@ public function analiza($splosniPodatki = null)
 
         // korekcija stranskega prenosa
         $this->K = 0;
-        if (!is_null($this->povrsinskaMasaStranskihElementov) && $this->povrsinskaMasaStranskihElementov > 0) {
+        if ($this->povrsinskaMasaStranskihElementov > 0) {
             $nearestMStranski = array_nearest(
                 array_keys($this->KLibMDodatnegaSloja),
                 $this->povrsinskaMasaStranskihElementov
@@ -178,7 +178,6 @@ public function analiza($splosniPodatki = null)
         // zaokroževanje Lnweq je po standardu
         $this->Lnw = round($this->Lnweq) - $this->deltaL + $this->K;
 
-
         $this->Lntw = $this->Lnw - 10 * log10($this->prostorninaSprejemnegaProstora / 30);
     }
 

diff --git a/src/Calc/Hrup/ZunanjiHrup/Prostor.php b/src/Calc/Hrup/ZunanjiHrup/Prostor.php
@@ -13,6 +13,7 @@ class Prostor
 
     public float $odmevniCas = 0;
     public float $prostornina = 0;
+    public float $korekcijaBocnegaPrenosa = 0;
 
     public float $Af = 0;
 
@@ -119,10 +120,11 @@ public function analiza($splosniPodatki = null)
             $this->Sf += $fasada->povrsina;
             $sumTau += $fasada->povrsina / $this->Sf * pow(10, -$fasada->Rw / 10);
         }
-        $this->Rw = -10 * log10($sumTau);
+
+        $this->Rw = -10 * log10($sumTau) - 10 * log10($this->Sf / $this->Af) + $this->korekcijaBocnegaPrenosa;
 
         // minimalna izolativnost konstrukcij, da se doseže nivo hrupa
-        $this->minRw = $this->Lzunaj - $this->Lmax + 10 * log10($this->Sf / $this->Af);
+        $this->minRw = $this->Lzunaj - $this->Lmax;
 
         Log::info(sprintf('"%s": Konec analize zunanjega hrupa - prostor', $this->id));
     }

diff --git a/src/Command/Hrup/IzracunZunanjegaHrupa.php b/src/Command/Hrup/IzracunZunanjegaHrupa.php
@@ -46,10 +46,6 @@ public function run($projectId = null)
                 $prostoriOut[] = $prostor->export();
             }
 
-            if (count($prostoriOut) == 0) {
-                throw new \Exception('Prostori obstajajo.');
-            }
-
             App::saveProjectCalculation('Hrup', $projectId, 'zunanjiHrup', $prostoriOut);
         }
     }

diff --git a/src/Core/App.php b/src/Core/App.php
@@ -56,12 +56,12 @@ public static function dispatch($controllerName, $vars, $area = 'Pures')
             $methodName = substr($methodName, 0, -(strlen($extension) + 1));
         }
 
-        if ($area) {
+        if ($controllerName !== 'App') {
             $controllerClass = 'App\Controller\\' . $area . '\\' . $controllerName . 'Controller';
         } else {
             $controllerClass = 'App\Controller\\' . $controllerName . 'Controller';
         }
-        
+
         // check if action exists
         if (!method_exists($controllerClass, $methodName)) {
             header('HTTP/1.0 404 Not Found');

diff --git a/templates/Hrup/ZunanjiHrup/view.php b/templates/Hrup/ZunanjiHrup/view.php
@@ -130,9 +130,12 @@
                         (<?= $this->numFormat($konstrukcija->C, 0) ?>; <?= $this->numFormat($konstrukcija->Ctr, 0) ?>)
                     </td>
                     <td class="center"><?= $this->numFormat($konstrukcija->stevilo, 0) ?> 
-                    <td class="center"><?= $this->numFormat($konstrukcija->povrsina, 1) ?> 
+                    <td class="center"><?= $this->numFormat($konstrukcija->povrsina, 2) ?> 
                     <td class="center"><?= $this->numFormat($konstrukcija->povrsina / $fasada->povrsina, 2) ?> 
-                    <td class="center"><?= $this->numFormat($konstrukcija->Rw + ($fasada->vplivPrometa ? $konstrukcija->Ctr : $konstrukcija->C), 0) ?> dB</td>
+                    <td class="center"><?= $this->numFormat($konstrukcija->Rw + ($fasada->vplivPrometa ? $konstrukcija->Ctr : $konstrukcija->C), 0) ?> dB
+                        <br />
+                        <?= sprintf('%.1E', $konstrukcija->povrsina * $konstrukcija->stevilo / $fasada->povrsina * pow(10, -($konstrukcija->Rw + ($fasada->vplivPrometa ? $konstrukcija->Ctr : $konstrukcija->C)) / 10) * $konstrukcija->stevilo) ?>
+                    </td>
                 </tr>
             <?php
                         $k++;
@@ -161,9 +164,12 @@
                         (<?= $this->numFormat($konstrukcija->C, 0) ?>; <?= $this->numFormat($konstrukcija->Ctr, 0) ?>)
                     </td>
                     <td class="center"><?= $this->numFormat($konstrukcija->stevilo, 0) ?> 
-                    <td class="center"><?= $this->numFormat($konstrukcija->povrsina, 1) ?> 
+                    <td class="center"><?= $this->numFormat($konstrukcija->povrsina, 2) ?> 
                     <td class="center"><?= $this->numFormat($konstrukcija->povrsina / $fasada->povrsina, 2) ?> 
-                    <td class="center"><?= $this->numFormat($konstrukcija->Rw + ($fasada->vplivPrometa ? $konstrukcija->Ctr : $konstrukcija->C), 0) ?> dB</td>
+                    <td class="center"><?= $this->numFormat($konstrukcija->Rw + ($fasada->vplivPrometa ? $konstrukcija->Ctr : $konstrukcija->C), 0) ?> dB
+                        <br />
+                        <?= sprintf('%.1E', $konstrukcija->povrsina * $konstrukcija->stevilo / $fasada->povrsina * pow(10, -($konstrukcija->Rw + ($fasada->vplivPrometa ? $konstrukcija->Ctr : $konstrukcija->C)) / 10) * $konstrukcija->stevilo) ?>
+                    </td>
                 </tr>
             <?php
                         $k++;
@@ -174,7 +180,7 @@
                     <td class="center">&nbsp;</td>
                     <td class="right strong" colspan="7">Skupaj:</td>
                     <td class="right strong">R'<sub>w</sub> = </td>
-                    <td class="center strong"><?= $this->numFormat($fasada->Rw, 0) ?> dB</td>
+                    <td class="center strong"><?= $this->numFormat($fasada->Rw, 1) ?> dB</td>
                 </tr>
             <table>
         </td>
@@ -185,12 +191,12 @@
 ?>
 
 <table width="100%" border="1">
-    <tr class="title"><th colspan="4"><h3>Skupaj za prostor</h3></th></tr>
+    <tr class="title"><th colspan="4"><h3>Skupaj za ovoj</h3></th></tr>
     <tr>
         <td class="strong">Z. št.:</td>
         <td class="center strong">Površina fasade<br />[m²]</td>
         <td class="center strong">Razmerje površin<br />S<sub>i</sub>/S<sub>f</sub></td>
-        <td class="center strong">R'<sub>w</sub></td>
+        <td class="center strong">Ocenjena izolirnost<br />R'<sub>w</sub></td>
     </tr>
 <?php
     $i = 1;
@@ -200,12 +206,37 @@
         <td>Fasada <?= $i ?></td>
         <td class="center"><?= $this->numFormat($fasada->povrsina) ?></td>
         <td class="center"><?= $this->numFormat($fasada->povrsina / $prostor->Sf, 2) ?> 
-        <td class="center"><?= $this->numFormat($fasada->Rw, 0) ?> dB</td>
+        <td class="center"><?= $this->numFormat($fasada->Rw, 1) ?> dB</td>
     </tr>
 <?php
         $i++;
     }
 ?>
+    <tr>
+        <td class="center">&nbsp;</td>
+        <td class="right strong">Skupaj ovoj:</td>
+        <td class="right strong">R'<sub>w</sub> = </td>
+        <td class="center strong"><?= $this->numFormat($prostor->Rw + 10 * log10($prostor->Sf / $prostor->Af) - $prostor->korekcijaBocnegaPrenosa, 1) ?> dB</td>
+    </tr>
+</table>
+
+<table width="100%" border="1">
+    <tr class="title"><th colspan="4"><h3>Skupaj za prostor</h3></th></tr>
+    <tr>
+        <td class="right strong" colspan="2">Izolirnost ovoja:</td>
+        <td class="right strong">&nbsp;</td>
+        <td class="center strong"><?= $this->numFormat($prostor->Rw + 10 * log10($prostor->Sf / $prostor->Af) - $prostor->korekcijaBocnegaPrenosa, 1) ?> dB</td>
+    </tr>
+    <tr>
+        <td class="right strong" colspan="2">Vpliv prostora:</td>
+        <td class="right strong">&nbsp;</td>
+        <td class="center strong">- <?= $this->numFormat(10 * log10($prostor->Sf / $prostor->Af), 1) ?> dB</td>
+    </tr>
+    <tr>
+        <td class="right strong" colspan="2">Korekcija bočnega prenosa:</td>
+        <td class="right strong">&nbsp;</td>
+        <td class="center strong"><?= $this->numFormat($prostor->korekcijaBocnegaPrenosa, 1) ?> dB</td>
+    </tr>
     <tr>
         <td class="right strong" colspan="2">Skupaj:</td>
         <td class="right strong">R'<sub>s,w</sub> = </td>
@@ -222,4 +253,9 @@
             <?= round($prostor->Rw, 0) >= round($prostor->minRw, 0) ? 'DA' : 'NE' ?>
         </td>
     </tr>
+    <tr>
+        <td class="right strong" colspan="2">Nivo hrupa v prostoru:</td>
+        <td class="right strong">L<sub>notri</sub> = </td>
+        <td class="center strong"><?= $this->numFormat($prostor->Lzunaj - $prostor->Rw, 0) ?> dB</td>
+    </tr>
 </table>
diff --git a/tests/Hrup/UdarniHrupTest.php b/tests/Hrup/UdarniHrupTest.php
@@ -15,6 +15,7 @@ public function testPrimerStandard12354_2(): void
             "naziv": "Talna konstrukcija",
             "tip": "horizontalna",
             "povrsinskaMasa": 322,
+            "Lnw": 76,
             "dodatniSloji": [
                 {
                     "id": "estrih",

diff --git a/webroot/index.php b/webroot/index.php
@@ -73,7 +73,7 @@
             case 'ProjectImage':
                 $controllerName = 'App';
                 $vars['action'] = 'projectImage';
-                $handler = null;
+                $handler = $vars['area'];
                 break;
             case 'Index':
                 $vars['controller'] = 'Projekti';