Compare commits

..

2 Commits

5 changed files with 51 additions and 71 deletions

View File

@@ -66,15 +66,6 @@
"units": ["g/m³", "mol/m³"] "units": ["g/m³", "mol/m³"]
} }
] ]
},
{
"name": "Quantity (TSS)",
"models": [
{
"name": "VegaSolidsProbe",
"units": ["g/m³"]
}
]
} }
] ]
} }

View File

@@ -412,14 +412,6 @@
], ],
"description": "The frequency at which calculations are performed." "description": "The frequency at which calculations are performed."
} }
},
"flowNumber": {
"default": 1,
"rules": {
"type": "number",
"nullable": false,
"description": "Defines which effluent flow of the parent node to handle."
}
} }
} }

View File

@@ -11,12 +11,8 @@ class ChildRegistrationUtils {
this.logger.debug(`Registering child: ${name} (${id}) as ${softwareType} at ${positionVsParent}`); this.logger.debug(`Registering child: ${name} (${id}) as ${softwareType} at ${positionVsParent}`);
// Enhanced child setup - multiple parents // Enhanced child setup
if (Array.isArray(child.parent)) { child.parent = this.mainClass;
child.parent.push(this.mainClass);
} else {
child.parent = [this.mainClass];
}
child.positionVsParent = positionVsParent; child.positionVsParent = positionVsParent;
// Enhanced measurement container with rich context // Enhanced measurement container with rich context

View File

@@ -40,7 +40,7 @@ class MeasurementBuilder {
if (!this.variant) { if (!this.variant) {
throw new Error('Measurement variant is required'); throw new Error('Measurement variant is required');
} }
if (!this.position) { if (Number.isNaN(this.position)) {
throw new Error('Measurement position is required'); throw new Error('Measurement position is required');
} }

View File

@@ -154,8 +154,9 @@ class MeasurementContainer {
}; };
// Emit the exact event your parent expects // Emit the exact event your parent expects
this.emitter.emit(`${this._currentType}.${this._currentVariant}.${this._convertPositionNum2Str(this._currentPosition)}`, eventData);
this.emitter.emit(`${this._currentType}.${this._currentVariant}.${this._currentPosition}`, eventData); this.emitter.emit(`${this._currentType}.${this._currentVariant}.${this._currentPosition}`, eventData);
//console.log(`Emitted event: ${this._currentType}.${this._currentVariant}.${this._currentPosition}`, eventData); // console.log(`Emitted event: ${this._currentType}.${this._currentVariant}.${this._currentPosition}`, eventData);
return this; return this;
} }
@@ -283,7 +284,7 @@ class MeasurementContainer {
// Helper methods // Helper methods
_ensureChainIsValid() { _ensureChainIsValid() {
if (!this._currentType || !this._currentVariant || !this._currentPosition) { if (!this._currentType || !this._currentVariant || Number.isNaN(this._currentPosition)) {
if (this.logger) { if (this.logger) {
this.logger.error('Incomplete measurement chain, required: type, variant, and position'); this.logger.error('Incomplete measurement chain, required: type, variant, and position');
} }