Merge branch 'main' into fix-missing-references
This commit is contained in:
@@ -11,7 +11,25 @@ class PhysicalPositionMenu {
|
||||
{ value: 'downstream', label: '→ Downstream' , icon: '→' }
|
||||
]
|
||||
}
|
||||
]
|
||||
],
|
||||
// Distance contexts for each position
|
||||
distanceContexts: {
|
||||
upstream: {
|
||||
description: 'Distance from parent inlet',
|
||||
placeholder: 'e.g., 2.5 (meters before parent)',
|
||||
helpText: 'How far upstream from the parent equipment'
|
||||
},
|
||||
downstream: {
|
||||
description: 'Distance from parent outlet',
|
||||
placeholder: 'e.g., 3.0 (meters after parent)',
|
||||
helpText: 'How far downstream from the parent equipment'
|
||||
},
|
||||
atEquipment: {
|
||||
description: 'Distance from parent start',
|
||||
placeholder: 'e.g., 1.2 (meters from start)',
|
||||
helpText: 'Position within the parent equipment boundaries'
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,6 +44,24 @@ class PhysicalPositionMenu {
|
||||
<!-- optgroups will be injected -->
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Distance section -->
|
||||
<div class="form-row">
|
||||
<label> </label>
|
||||
<input type="checkbox" id="node-input-hasDistance" style="display:inline-block; width:auto; margin-right:5px;">
|
||||
<label for="node-input-hasDistance" style="width:auto;">Specify 1D Distance</label>
|
||||
</div>
|
||||
|
||||
<div id="distance-section" class="form-row" style="display:none;">
|
||||
<label for="node-input-distance"><i class="fa fa-ruler"></i>Distance</label>
|
||||
<div style="display:flex; align-items:center; width:70%;">
|
||||
<input type="number" id="node-input-distance" step="0.1" min="0" style="width:60%;" placeholder="0.0">
|
||||
<span style="margin-left:5px; margin-right:5px;">meters</span>
|
||||
</div>
|
||||
<div id="distance-help" class="form-tips" style="margin-left:105px; font-size:11px; color:#666;">
|
||||
Select a position to see distance context
|
||||
</div>
|
||||
</div>
|
||||
<hr />
|
||||
`;
|
||||
}
|
||||
@@ -52,7 +88,12 @@ class PhysicalPositionMenu {
|
||||
window.EVOLV.nodes.${nodeName}.positionMenu.loadData = function(node) {
|
||||
const data = window.EVOLV.nodes.${nodeName}.menuData.position;
|
||||
const sel = document.getElementById('node-input-positionVsParent');
|
||||
if (!sel) return;
|
||||
const hasDistanceCheck = document.getElementById('node-input-hasDistance');
|
||||
const distanceInput = document.getElementById('node-input-distance');
|
||||
const distanceSection = document.getElementById('distance-section');
|
||||
|
||||
//Load position options
|
||||
if (sel) {
|
||||
sel.innerHTML = '';
|
||||
(data.positionGroups||[]).forEach(grp => {
|
||||
const optg = document.createElement('optgroup');
|
||||
@@ -66,8 +107,21 @@ class PhysicalPositionMenu {
|
||||
});
|
||||
sel.appendChild(optg);
|
||||
});
|
||||
// default to “atEquipment” if not set
|
||||
sel.value = node.positionVsParent || 'atEquipment';
|
||||
}
|
||||
|
||||
//Load distance values
|
||||
if (hasDistanceCheck) {
|
||||
hasDistanceCheck.checked = node.hasDistance || false;
|
||||
distanceSection.style.display = hasDistanceCheck.checked ? 'block' : 'none';
|
||||
}
|
||||
|
||||
if (distanceInput) {
|
||||
distanceInput.value = node.distance || '';
|
||||
}
|
||||
|
||||
// Update distance context for current position
|
||||
this.updateDistanceContext(node.positionVsParent || 'atEquipment', data.distanceContexts);
|
||||
};
|
||||
`;
|
||||
}
|
||||
@@ -77,7 +131,46 @@ class PhysicalPositionMenu {
|
||||
return `
|
||||
// PhysicalPosition events for ${nodeName}
|
||||
window.EVOLV.nodes.${nodeName}.positionMenu.wireEvents = function(node) {
|
||||
// no dynamic behavior
|
||||
const positionSel = document.getElementById('node-input-positionVsParent');
|
||||
const hasDistanceCheck = document.getElementById('node-input-hasDistance');
|
||||
const distanceSection = document.getElementById('distance-section');
|
||||
const data = window.EVOLV.nodes.${nodeName}.menuData.position;
|
||||
|
||||
// Toggle distance section visibility
|
||||
if (hasDistanceCheck && distanceSection) {
|
||||
hasDistanceCheck.addEventListener('change', function() {
|
||||
distanceSection.style.display = this.checked ? 'block' : 'none';
|
||||
|
||||
// Clear distance if unchecked
|
||||
if (!this.checked) {
|
||||
const distanceInput = document.getElementById('node-input-distance');
|
||||
if (distanceInput) {
|
||||
distanceInput.value = '';
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Update distance context when position changes
|
||||
if (positionSel) {
|
||||
positionSel.addEventListener('change', function() {
|
||||
const position = this.value;
|
||||
window.EVOLV.nodes.${nodeName}.positionMenu.updateDistanceContext(position, data.distanceContexts);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// Helper function to update distance context
|
||||
window.EVOLV.nodes.${nodeName}.positionMenu.updateDistanceContext = function(position, contexts) {
|
||||
const distanceInput = document.getElementById('node-input-distance');
|
||||
const distanceHelp = document.getElementById('distance-help');
|
||||
|
||||
const context = contexts && contexts[position];
|
||||
|
||||
if (context && distanceInput && distanceHelp) {
|
||||
distanceInput.placeholder = context.placeholder || '0.0';
|
||||
distanceHelp.textContent = context.helpText || 'Enter distance in meters';
|
||||
}
|
||||
};
|
||||
`;
|
||||
}
|
||||
@@ -88,9 +181,32 @@ class PhysicalPositionMenu {
|
||||
// PhysicalPosition Save injection for ${nodeName}
|
||||
window.EVOLV.nodes.${nodeName}.positionMenu.saveEditor = function(node) {
|
||||
const sel = document.getElementById('node-input-positionVsParent');
|
||||
const hasDistanceCheck = document.getElementById('node-input-hasDistance');
|
||||
const distanceInput = document.getElementById('node-input-distance');
|
||||
|
||||
// Save existing position data
|
||||
node.positionVsParent = sel ? sel.value : 'atEquipment';
|
||||
node.positionLabel = sel ? sel.options[sel.selectedIndex].textContent : 'At Equipment';
|
||||
node.positionIcon = sel ? sel.options[sel.selectedIndex].getAttribute('data-icon') : 'fa fa-cog';
|
||||
|
||||
// Save distance data (NEW)
|
||||
node.hasDistance = hasDistanceCheck ? hasDistanceCheck.checked : false;
|
||||
|
||||
if (node.hasDistance && distanceInput && distanceInput.value) {
|
||||
node.distance = parseFloat(distanceInput.value) || 0;
|
||||
node.distanceUnit = 'm'; // Fixed to meters for now
|
||||
|
||||
// Generate distance description based on position
|
||||
const contexts = window.EVOLV.nodes.${nodeName}.menuData.position.distanceContexts;
|
||||
const context = contexts && contexts[node.positionVsParent];
|
||||
node.distanceDescription = context ? context.description : 'Distance from parent';
|
||||
} else {
|
||||
// Clear distance data if not specified
|
||||
delete node.distance;
|
||||
delete node.distanceUnit;
|
||||
delete node.distanceDescription;
|
||||
}
|
||||
|
||||
return true;
|
||||
};
|
||||
`;
|
||||
|
||||
Reference in New Issue
Block a user