Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@malamalca
malamalca committed Sep 20, 2024
1 parent 0ade6d4 commit bafeaac
Show file tree
Hide file tree
Showing 18 changed files with 514 additions and 31 deletions.
18 changes: 13 additions & 5 deletions projects/Hrup/TestniProjekt/izracuni/elementi/konstrukcije.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,28 @@
"5000": 78.98814516878451
},
"Rw": 63,
"dR": 0,
"dR": -1,
"C": -7,
"Ctr": -10,
"dodatniSloji": [
{
"vrsta": "elasticen",
"naziv": "MW Lamele",
"povrsinskaMasa": 26,
"dinamicnaTogost": 45
"dinamicnaTogost": 45,
"dR": -1
}
]
},
{
"id": "Z.1",
"naziv": "AB 20 cm",
"povrsinskaMasa": 460,
"Rw": 57,
"Rw": 58,
"dR": -1,
"C": -2,
"Ctr": -7,
"Lnw": 70.80347589114491,
"dodatniSloji": [
{
"vrsta": "elasticen",
Expand All @@ -67,10 +69,11 @@
"id": "T.1",
"naziv": "Talna konstrukcija",
"povrsinskaMasa": 322,
"Rw": 61,
"Rw": 52,
"dR": 9,
"C": -2,
"Ctr": -7,
"Lnw": 76.22504449064593,
"dodatniSloji": [
{
"id": "estrih",
Expand All @@ -90,6 +93,7 @@
"dR": 0,
"C": -2,
"Ctr": -7,
"Lnw": 70.80347589114491,
"dodatniSloji": []
},
{
Expand All @@ -100,6 +104,7 @@
"dR": 0,
"C": -1,
"Ctr": -4,
"Lnw": 85.49366829597969,
"dodatniSloji": []
},
{
Expand All @@ -110,6 +115,7 @@
"dR": 0,
"C": -1,
"Ctr": -1,
"Lnw": 100.08738190547108,
"dodatniSloji": []
},
{
Expand All @@ -120,16 +126,18 @@
"dR": 0,
"C": -2,
"Ctr": -5,
"Lnw": 81.33952573938424,
"dodatniSloji": []
},
{
"id": "ZH.5",
"naziv": "Zvok v zraku - talna konstrukcija - beton 100mm\/zaključni sloj 30mm",
"povrsinskaMasa": 287,
"Rw": 63,
"Rw": 49,
"dR": 14,
"C": -2,
"Ctr": -6,
"Lnw": 77.97413361431026,
"dodatniSloji": [
{
"id": "estrih",
Expand Down
3 changes: 2 additions & 1 deletion projects/Hrup/TestniProjekt/izracuni/udarniHrup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
"id": "T.1",
"naziv": "Talna konstrukcija",
"povrsinskaMasa": 322,
"Rw": 61,
"Rw": 52,
"dR": 9,
"C": -2,
"Ctr": -7,
"Lnw": 76.22504449064593,
"dodatniSloji": [
{
"id": "estrih",
Expand Down
13 changes: 9 additions & 4 deletions projects/Hrup/TestniProjekt/izracuni/zracniHrup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"dR": 0,
"C": -2,
"Ctr": -7,
"Lnw": 70.80347589114491,
"dodatniSloji": []
}
},
Expand Down Expand Up @@ -52,6 +53,7 @@
"dR": 0,
"C": -1,
"Ctr": -4,
"Lnw": 85.49366829597969,
"dodatniSloji": []
}
},
Expand Down Expand Up @@ -83,6 +85,7 @@
"dR": 0,
"C": -1,
"Ctr": -1,
"Lnw": 100.08738190547108,
"dodatniSloji": []
}
},
Expand Down Expand Up @@ -114,6 +117,7 @@
"dR": 0,
"C": -2,
"Ctr": -5,
"Lnw": 81.33952573938424,
"dodatniSloji": []
}
},
Expand All @@ -130,9 +134,9 @@
"K_Df": 8.93925264770768,
"K_Ff": 12.442631135311327,
"K_Fd": 8.93925264770768,
"R_Df": 87.00465445204722,
"R_Ff": 100.50803293965089,
"R_Fd": 87.00465445204722,
"R_Df": 80.00465445204722,
"R_Ff": 86.50803293965089,
"R_Fd": 80.00465445204722,
"pozicijeElementov": {
"locilni": 2,
"izvorni": 1,
Expand All @@ -142,10 +146,11 @@
"id": "ZH.5",
"naziv": "Zvok v zraku - talna konstrukcija - beton 100mm\/zaključni sloj 30mm",
"povrsinskaMasa": 287,
"Rw": 63,
"Rw": 49,
"dR": 14,
"C": -2,
"Ctr": -6,
"Lnw": 77.97413361431026,
"dodatniSloji": [
{
"id": "estrih",
Expand Down
50 changes: 48 additions & 2 deletions projects/Hrup/TestniProjekt/izracuni/zunanjiHrup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,56 @@
"naziv": "Dnevna soba",
"odmevniCas": 0.5,
"prostornina": 37.2,
"korekcijaBocnegaPrenosa": 0,
"Af": 12.127200000000002,
"Sf": 24.2,
"minRw": 28.000548260305948,
"Rw": 23.99855711713521,
"minRw": 25,
"Rw": 20.998008856829262,
"Lzunaj": 60,
"Lmax": 35,
"fasade": [
{
"Rw": 23.99855711713521,
"deltaL_fasada": 0,
"povrsina": 24.2,
"vplivPrometa": true,
"oblikaFasade": "ravna",
"koeficientStropa": null,
"visinaLinijePogleda": null,
"konstrukcije": [
{
"idKonstrukcije": "Z.1",
"povrsina": 14.6,
"stevilo": 1,
"Rw": 57,
"C": -2,
"Ctr": -7
}
],
"oknaVrata": [
{
"idOknaVrata": "O.1",
"povrsina": 4.8,
"stevilo": 2,
"Rw": 27,
"C": -1,
"Ctr": -4
}
],
"maliElementi": []
}
]
},
{
"id": "P.2",
"naziv": "Dnevna soba - Kompleksno",
"odmevniCas": 0.5,
"prostornina": 37.2,
"korekcijaBocnegaPrenosa": 0,
"Af": 12.127200000000002,
"Sf": 24.2,
"minRw": 25,
"Rw": 20.998008856829262,
"Lzunaj": 60,
"Lmax": 35,
"fasade": [
Expand Down
Binary file modified projects/Hrup/TestniProjekt/pdf/HrupElaborat.pdf
View file
Binary file not shown.
Binary file modified projects/Hrup/TestniProjekt/pdf/HrupIzkaz.pdf
View file
Binary file not shown.
27 changes: 27 additions & 0 deletions projects/Hrup/TestniProjekt/podatki/zunanjiHrup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,32 @@
]
}
]
},
{
"id": "P.2",
"naziv": "Dnevna soba - Kompleksno",
"prostornina": 37.2,
"odmevniCas": 0.5,
"Lzunaj": 60,
"Lmax": 35,
"fasade": [
{
"vplivPrometa": true,
"oblikaFasade": "ravna",
"konstrukcije": [
{
"idKonstrukcije": "Z.1",
"povrsina": 14.6
}
],
"oknaVrata": [
{
"idOknaVrata": "O.1",
"stevilo": 2,
"povrsina": 4.8
}
]
}
]
}
]
3 changes: 3 additions & 0 deletions src/Calc/GF/TSS/OgrevalniSistemi/Podsistemi/GeneratorFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

namespace App\Calc\GF\TSS\OgrevalniSistemi\Podsistemi;

use App\Calc\GF\TSS\OgrevalniSistemi\Podsistemi\Generatorji\ElektricniGrelnik;
use App\Calc\GF\TSS\OgrevalniSistemi\Podsistemi\Generatorji\Kotel;
use App\Calc\GF\TSS\OgrevalniSistemi\Podsistemi\Generatorji\ToplotnaCrpalkaZrakVoda;
use App\Calc\GF\TSS\OgrevalniSistemi\Podsistemi\Generatorji\ToplotnaPodpostaja;
Expand All @@ -28,6 +29,8 @@ public static function create($type, $options = null)
return new Kotel('PlinskiKotel', $options);
case 'biomasa':
return new Kotel('Biomasa', $options);
case 'elektricniGrelnik':
return new ElektricniGrelnik($options);
default:
throw new \Exception(sprintf('Generator : Vrsta "%s" ne obstaja', $type));
}
Expand Down
Loading

0 comments on commit bafeaac

Please sign in to comment.