Skip to content

Commit f3349b6

Browse files
committed
Performance improvements:
- SVG symbolen worden nu enkel in de defs-sectie opgenomen als ze ook effectief worden gebruikt - De undoredo class vermijdt externe images telkens opnieuw op te slaan door gebruikt van een externe stringstore. Verbeteringen aan de user experience: - Aanpassingen aan de manier waarop switches tussen eendraadschema en situatieschema worden geregistreerd voor undo/redo alsook wijzigingen van actieve pagina in het situatieschema - Bij printen wordt de z-Index correct toegepast Refactoring: - Handige functie in Hierarchical_List om een Electro_Item te zoeken op basis van id. - Aanzienlijke refactoring in SituationPlanElement - Beperkte refactoring in SituationPlan Documentatie - introductie typedoc en eerste testen op SituationPlanElement en SituationPlan - typedoc output zal niet aan de repository worden toegevoegd maar kan wel gegenereerd worden met het bash-script makedoc
1 parent 0e28091 commit f3349b6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1929
-847
lines changed

builddate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
var CONF_builddate="20250101-192145"
1+
var CONF_builddate="20250105-150906"

eendraadschema.js

Lines changed: 693 additions & 186 deletions
Large diffs are not rendered by default.

makedoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/bash
2+
3+
npx typedoc --options typedoc.json

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"devDependencies": {
3+
"typedoc": "^0.27.6",
34
"typescript": "^5.6.2"
45
},
56
"dependencies": {

src/Hierarchical_List.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
remove inactive members from the array.
1717
getOrdinalById(my_id: number) : number
1818
Returns the element in the array for a given ID
19+
getElectroItemById(my_id: number) : Electro_Item
20+
Returns the Electro_Item in the array for a given ID
1921
getNumChilds(parent_id: number) : number
2022
Returns the number of childs for a given parent ID
2123
getMaxNumChilds(parent_id: number) : number
@@ -164,13 +166,19 @@ class Hierarchical_List {
164166

165167
// -- Plaats in de array zoeken op basis van de id --
166168

167-
getOrdinalById(my_id: number) : number {
169+
getOrdinalById(my_id: number) : number | null {
168170
for (let i = 0; i<this.length; i++) {
169171
if (this.id[i]==my_id) return(i);
170172
}
171173
return null;
172174
}
173175

176+
getElectroItemById(my_id: number) : Electro_Item | null {
177+
let ordinal = this.getOrdinalById(my_id);
178+
if (ordinal !== null) return(this.data[ordinal] as Electro_Item);
179+
return null;
180+
}
181+
174182
// -- Aantal actieve kinderen van id = parent_id --
175183

176184
getNumChilds(parent_id: number) : number {

src/List_Item/Aansluiting.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ class Aansluiting extends Electro_Item {
114114
toSVG() {
115115
let mySVG:SVGelement = new SVGelement();
116116

117+
SVGSymbols.addSymbol('zekering_automatisch');
118+
SVGSymbols.addSymbol('zekering_empty');
119+
SVGSymbols.addSymbol('arrow');
120+
SVGSymbols.addSymbol('zekering_smelt');
121+
SVGSymbols.addSymbol('elekriciteitsmeter');
122+
117123
// Indien er een kabeltype vóór de teller is schuiven we alles op
118124
let extrashift = 0;
119125
if (this.props.type_kabel_voor_teller != "") extrashift += 50;

src/List_Item/Aansluitpunt.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class Aansluitpunt extends Electro_Item {
2424
toSVG(sitplan: boolean = false) {
2525
let mySVG:SVGelement = new SVGelement();
2626

27+
SVGSymbols.addSymbol('aansluitpunt');
28+
2729
mySVG.xleft = 1; // foresee at least some space for the conductor
2830
mySVG.xright = 29;
2931
mySVG.yup = 25;

src/List_Item/Aftakdoos.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ class Aftakdoos extends Electro_Item {
2424
toSVG(sitplan: boolean = false) {
2525
let mySVG:SVGelement = new SVGelement();
2626

27+
SVGSymbols.addSymbol('aftakdoos');
28+
2729
mySVG.xleft = 1; // foresee at least some space for the conductor
2830
mySVG.xright = 49;
2931
mySVG.yup = 25;

src/List_Item/Batterij.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ class Batterij extends Electro_Item {
2525
let mySVG:SVGelement = new SVGelement();
2626
let outputstr:string = "";
2727

28+
SVGSymbols.addSymbol('batterij');
29+
2830
mySVG.xleft = 1; // foresee at least some space for the conductor
2931
mySVG.xright = 59;
3032
mySVG.yup = 25;

src/List_Item/Bel.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ class Bel extends Electro_Item {
2525
let mySVG:SVGelement = new SVGelement();
2626
let outputstr:string = "";
2727

28+
SVGSymbols.addSymbol('bel');
29+
2830
mySVG.xleft = 1; // foresee at least some space for the conductor
2931
mySVG.xright = 40;
3032
mySVG.yup = 25;

0 commit comments

Comments
 (0)