Skip to content

Commit 2af4971

Browse files
igoethaligoethal
committed
Kortsluitstroom nu ook in een kader voor de aansluiting
1 parent f161fff commit 2af4971

File tree

3 files changed

+37
-25
lines changed

3 files changed

+37
-25
lines changed

‎builddate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
var CONF_builddate="20241130-231424"
1+
var CONF_builddate="20241130-232032"

‎eendraadschema.js

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2454,18 +2454,18 @@ var Aansluiting = /** @class */ (function (_super) {
24542454
case "differentieel":
24552455
output += ", \u0394 " + this.stringPropToHTML('differentieel_delta_amperage', 3) + "mA"
24562456
+ ", Type:" + this.selectPropToHTML('type_differentieel', ["", "A", "B"])
2457-
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA"
2457+
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA"
24582458
+ ", Selectief: " + this.checkboxPropToHTML('differentieel_is_selectief');
24592459
break;
24602460
case "automatisch":
24612461
output += ", Curve:" + this.selectPropToHTML('curve_automaat', ["", "B", "C", "D"])
2462-
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA";
2462+
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA";
24632463
break;
24642464
case "differentieelautomaat":
24652465
output += ", \u0394 " + this.stringPropToHTML('differentieel_delta_amperage', 3) + "mA"
24662466
+ ", Curve:" + this.selectPropToHTML('curve_automaat', ["", "B", "C", "D"])
24672467
+ ", Type:" + this.selectPropToHTML('type_differentieel', ["", "A", "B"])
2468-
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA"
2468+
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen', 3) + "kA"
24692469
+ ", Selectief: " + this.checkboxPropToHTML('differentieel_is_selectief');
24702470
break;
24712471
}
@@ -2507,11 +2507,13 @@ var Aansluiting = /** @class */ (function (_super) {
25072507
}
25082508
// Code om kortsluitvermogen toe te voegen
25092509
if ((this.props.kortsluitvermogen != '')) {
2510-
++numlines;
2510+
numlines = numlines + 1.3;
25112511
mySVG.data += "<text x=\"" + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "\" y=\"" + (mySVG.yup - 10) + "\""
25122512
+ " transform=\"rotate(-90 " + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "," + (mySVG.yup - 10) + ")"
25132513
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
2514-
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
2514+
+ htmlspecialchars("" + (this.props.kortsluitvermogen * 1000)) + "</text>";
2515+
var rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen * 1000))) + 6;
2516+
mySVG.data += '<rect x="' + (mySVG.xleft + 15 + 11 * (numlines - 2) + 1) + '" y="' + (mySVG.yup - 10 - (rectsize / 2)) + '" width="' + (11 * 1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
25152517
}
25162518
// Genoeg plaats voorzien aan de rechterkant en eindigen
25172519
mySVG.xright = Math.max(mySVG.xright, 20 + 11 * (numlines - 1));
@@ -2547,11 +2549,13 @@ var Aansluiting = /** @class */ (function (_super) {
25472549
}
25482550
// Code om kortsluitvermogen toe te voegen
25492551
if ((this.props.kortsluitvermogen != '')) {
2550-
++numlines;
2552+
numlines = numlines + 1.3;
25512553
mySVG.data += "<text x=\"" + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "\" y=\"" + (mySVG.yup - 10) + "\""
25522554
+ " transform=\"rotate(-90 " + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "," + (mySVG.yup - 10) + ")"
25532555
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
2554-
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
2556+
+ htmlspecialchars("" + (this.props.kortsluitvermogen * 1000)) + "</text>";
2557+
var rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen * 1000))) + 6;
2558+
mySVG.data += '<rect x="' + (mySVG.xleft + 15 + 11 * (numlines - 2) + 1) + '" y="' + (mySVG.yup - 10 - (rectsize / 2)) + '" width="' + (11 * 1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
25552559
}
25562560
// genoeg plaats voorzien aan de rechterkant en eindigen
25572561
mySVG.xright = Math.max(mySVG.xright, 20 + 11 * (numlines - 1));
@@ -2595,11 +2599,13 @@ var Aansluiting = /** @class */ (function (_super) {
25952599
}
25962600
// Code om kortsluitvermogen toe te voegen
25972601
if ((this.props.kortsluitvermogen != '')) {
2598-
++numlines;
2602+
numlines = numlines + 1.3;
25992603
mySVG.data += "<text x=\"" + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "\" y=\"" + (mySVG.yup - 10) + "\""
26002604
+ " transform=\"rotate(-90 " + (mySVG.xleft + 15 + 11 * (numlines - 1)) + "," + (mySVG.yup - 10) + ")"
26012605
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
2602-
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
2606+
+ htmlspecialchars("" + (this.props.kortsluitvermogen * 1000)) + "</text>";
2607+
var rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen * 1000))) + 6;
2608+
mySVG.data += '<rect x="' + (mySVG.xleft + 15 + 11 * (numlines - 2) + 1) + '" y="' + (mySVG.yup - 10 - (rectsize / 2)) + '" width="' + (11 * 1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
26032609
}
26042610
// genoeg plaats voorzien aan de rechterkant en eindigen
26052611
mySVG.xright = Math.max(mySVG.xright, 20 + 11 * (numlines - 1));

‎src/List_Item/Aansluiting.ts

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,20 @@ class Aansluiting extends Electro_Item {
7777
case "differentieel":
7878
output += ", \u0394 " + this.stringPropToHTML('differentieel_delta_amperage',3) + "mA"
7979
+ ", Type:" + this.selectPropToHTML('type_differentieel',["","A","B"])
80-
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA"
80+
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA"
8181
+ ", Selectief: " + this.checkboxPropToHTML('differentieel_is_selectief');
8282
break;
8383

8484
case "automatisch":
8585
output += ", Curve:" + this.selectPropToHTML('curve_automaat',["","B","C","D"])
86-
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA";
86+
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA";
8787
break;
8888

8989
case "differentieelautomaat":
9090
output += ", \u0394 " + this.stringPropToHTML('differentieel_delta_amperage',3) + "mA"
9191
+ ", Curve:" + this.selectPropToHTML('curve_automaat',["","B","C","D"])
9292
+ ", Type:" + this.selectPropToHTML('type_differentieel',["","A","B"])
93-
+ ", Kortsluitvermogen: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA"
93+
+ ", Kortsluitstroom: " + this.stringPropToHTML('kortsluitvermogen',3) + "kA"
9494
+ ", Selectief: " + this.checkboxPropToHTML('differentieel_is_selectief');
9595
break;
9696

@@ -146,11 +146,13 @@ class Aansluiting extends Electro_Item {
146146

147147
// Code om kortsluitvermogen toe te voegen
148148
if ( (this.props.kortsluitvermogen!='') ) {
149-
++numlines;
149+
numlines = numlines + 1.3;
150150
mySVG.data += "<text x=\"" + (mySVG.xleft+15+11*(numlines-1)) + "\" y=\"" + (mySVG.yup-10) + "\""
151-
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
152-
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
153-
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
151+
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
152+
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
153+
+ htmlspecialchars("" + (this.props.kortsluitvermogen*1000)) + "</text>";
154+
let rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen*1000)))+6;
155+
mySVG.data += '<rect x="' + (mySVG.xleft+15+11*(numlines-2)+1) + '" y="' + (mySVG.yup-10-(rectsize/2)) + '" width="' + (11*1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
154156
}
155157

156158
// Genoeg plaats voorzien aan de rechterkant en eindigen
@@ -194,11 +196,13 @@ class Aansluiting extends Electro_Item {
194196

195197
// Code om kortsluitvermogen toe te voegen
196198
if ( (this.props.kortsluitvermogen!='') ) {
197-
++numlines;
199+
numlines = numlines + 1.3;
198200
mySVG.data += "<text x=\"" + (mySVG.xleft+15+11*(numlines-1)) + "\" y=\"" + (mySVG.yup-10) + "\""
199-
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
200-
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
201-
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
201+
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
202+
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
203+
+ htmlspecialchars("" + (this.props.kortsluitvermogen*1000)) + "</text>";
204+
let rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen*1000)))+6;
205+
mySVG.data += '<rect x="' + (mySVG.xleft+15+11*(numlines-2)+1) + '" y="' + (mySVG.yup-10-(rectsize/2)) + '" width="' + (11*1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
202206
}
203207

204208
// genoeg plaats voorzien aan de rechterkant en eindigen
@@ -250,11 +254,13 @@ class Aansluiting extends Electro_Item {
250254

251255
// Code om kortsluitvermogen toe te voegen
252256
if ( (this.props.kortsluitvermogen!='') ) {
253-
++numlines;
257+
numlines = numlines + 1.3;
254258
mySVG.data += "<text x=\"" + (mySVG.xleft+15+11*(numlines-1)) + "\" y=\"" + (mySVG.yup-10) + "\""
255-
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
256-
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
257-
+ htmlspecialchars("" + this.props.kortsluitvermogen) + "kA</text>";
259+
+ " transform=\"rotate(-90 " + (mySVG.xleft+15+11*(numlines-1)) + "," + (mySVG.yup-10) + ")"
260+
+ "\" style=\"text-anchor:middle\" font-family=\"Arial, Helvetica, sans-serif\" font-size=\"10\">"
261+
+ htmlspecialchars("" + (this.props.kortsluitvermogen*1000)) + "</text>";
262+
let rectsize = svgTextWidth(htmlspecialchars("" + (this.props.kortsluitvermogen*1000)))+6;
263+
mySVG.data += '<rect x="' + (mySVG.xleft+15+11*(numlines-2)+1) + '" y="' + (mySVG.yup-10-(rectsize/2)) + '" width="' + (11*1.2) + '" height="' + rectsize + '" fill="none" stroke="black" />';
258264
}
259265

260266
// genoeg plaats voorzien aan de rechterkant en eindigen

0 commit comments

Comments
 (0)