Fixed Timing / Data Update Logic / Low Health Overlay Issues / Comparison Node and Math Node issues.
This commit is contained in:
@ -1,14 +1,15 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Math Operation Node:
|
||||
- Inputs: Two input ports ("A" and "B").
|
||||
- Output: One output port ("Result").
|
||||
- Operation: A dropdown (combo menu) to select:
|
||||
Add, Subtract, Multiply, Divide, Average.
|
||||
- Displays the computed result in a read-only text box labeled "Result".
|
||||
Standardized Math Operation Node:
|
||||
- Performs mathematical operations (+, -, *, /, avg) on two inputs.
|
||||
- Outputs the computed result.
|
||||
- Uses a global update timer for processing (defined in borealis.py).
|
||||
- Ensures it always has a "value" property that the Comparison Node can read.
|
||||
"""
|
||||
|
||||
from OdenGraphQt import BaseNode
|
||||
from Qt import QtCore
|
||||
|
||||
class MathOperationNode(BaseNode):
|
||||
__identifier__ = 'bunny-lab.io.math_node'
|
||||
@ -16,60 +17,38 @@ class MathOperationNode(BaseNode):
|
||||
|
||||
def __init__(self):
|
||||
super(MathOperationNode, self).__init__()
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Initialization Section:
|
||||
# - Create two input ports: A, B
|
||||
# - Create one output port: Result
|
||||
# - Add a combo box for operator selection
|
||||
# - Add a text input for displaying the computed result
|
||||
# ----------------------------------------------------------------------
|
||||
self.add_input('A')
|
||||
self.add_input('B')
|
||||
self.add_output('Result')
|
||||
|
||||
# Operator combo box (Add, Subtract, Multiply, Divide, Average)
|
||||
|
||||
# Drop-down to choose which operation we do:
|
||||
self.add_combo_menu('operator', 'Operator', items=[
|
||||
'Add', 'Subtract', 'Multiply', 'Divide', 'Average'
|
||||
])
|
||||
|
||||
# Text input for displaying the computed result.
|
||||
# We'll make it read-only by accessing the underlying QLineEdit.
|
||||
# A text field for showing the result to the user:
|
||||
self.add_text_input('calc_result', 'Result', text='0')
|
||||
result_widget = self.get_widget('calc_result') # This is a NodeLineEdit wrapper
|
||||
if result_widget:
|
||||
# Get the underlying QLineEdit
|
||||
line_edit = result_widget.get_custom_widget()
|
||||
# Make the QLineEdit read-only
|
||||
line_edit.setReadOnly(True)
|
||||
|
||||
# IMPORTANT: define a "value" property that the Comparison Node can read
|
||||
# We do not necessarily need a text input for it, but adding it ensures
|
||||
# it becomes an official property recognized by OdenGraphQt.
|
||||
self.add_text_input('value', 'Internal Value', text='0')
|
||||
|
||||
# Keep a Python-side float of the current computed result:
|
||||
self.value = 0
|
||||
|
||||
# Give the node a nice name:
|
||||
self.set_name("Math Operation")
|
||||
self.process_input()
|
||||
|
||||
def process_input(self, event=None):
|
||||
"""
|
||||
Compute Section:
|
||||
- For each input port (A, B), if connected, grab the 'value' from
|
||||
the upstream node; otherwise default to 0.0.
|
||||
- Convert to float, apply the selected operation from the combo box,
|
||||
update the "Result" text box, node title, and output port.
|
||||
"""
|
||||
# Gather input A
|
||||
# Removed self-contained timer; global timer calls process_input().
|
||||
|
||||
def process_input(self):
|
||||
# Attempt to read "value" from both inputs:
|
||||
input_a = self.input(0)
|
||||
if input_a and input_a.connected_ports():
|
||||
a_raw = input_a.connected_ports()[0].node().get_property('value')
|
||||
else:
|
||||
a_raw = 0.0
|
||||
|
||||
# Gather input B
|
||||
input_b = self.input(1)
|
||||
if input_b and input_b.connected_ports():
|
||||
b_raw = input_b.connected_ports()[0].node().get_property('value')
|
||||
else:
|
||||
b_raw = 0.0
|
||||
a_raw = input_a.connected_ports()[0].node().get_property('value') if input_a.connected_ports() else "0"
|
||||
b_raw = input_b.connected_ports()[0].node().get_property('value') if input_b.connected_ports() else "0"
|
||||
|
||||
# Convert raw inputs to floats (default 0.0 on failure).
|
||||
try:
|
||||
a_val = float(a_raw)
|
||||
except (ValueError, TypeError):
|
||||
@ -79,10 +58,7 @@ class MathOperationNode(BaseNode):
|
||||
except (ValueError, TypeError):
|
||||
b_val = 0.0
|
||||
|
||||
# Retrieve the selected operator from the combo box.
|
||||
operator = self.get_property('operator')
|
||||
result = 0.0
|
||||
|
||||
if operator == 'Add':
|
||||
result = a_val + b_val
|
||||
elif operator == 'Subtract':
|
||||
@ -93,30 +69,41 @@ class MathOperationNode(BaseNode):
|
||||
result = a_val / b_val if b_val != 0 else 0.0
|
||||
elif operator == 'Average':
|
||||
result = (a_val + b_val) / 2.0
|
||||
else:
|
||||
result = 0.0
|
||||
|
||||
self.value = result
|
||||
# If the computed result changed, update our internal properties and transmit
|
||||
if self.value != result:
|
||||
self.value = result
|
||||
|
||||
# Update the read-only text input and node title.
|
||||
self.set_property('calc_result', str(result))
|
||||
# Update the two text fields so the user sees the numeric result:
|
||||
self.set_property('calc_result', str(result))
|
||||
self.set_property('value', str(result)) # <= This is the critical step
|
||||
|
||||
# Transmit the numeric result to any connected output nodes.
|
||||
output_port = self.output(0)
|
||||
if output_port and output_port.connected_ports():
|
||||
for cp in output_port.connected_ports():
|
||||
connected_node = cp.node()
|
||||
if hasattr(connected_node, 'receive_data'):
|
||||
connected_node.receive_data(result, source_port_name='Result')
|
||||
# Let downstream nodes know there's new data:
|
||||
self.transmit_data(result)
|
||||
|
||||
def on_input_connected(self, input_port, output_port):
|
||||
self.process_input()
|
||||
pass
|
||||
|
||||
def on_input_disconnected(self, input_port, output_port):
|
||||
self.process_input()
|
||||
pass
|
||||
|
||||
def property_changed(self, property_name):
|
||||
if property_name in ['operator']:
|
||||
self.process_input()
|
||||
pass
|
||||
|
||||
def receive_data(self, data, source_port_name=None):
|
||||
self.process_input()
|
||||
pass
|
||||
|
||||
def transmit_data(self, data):
|
||||
output_port = self.output(0)
|
||||
if output_port and output_port.connected_ports():
|
||||
for connected_port in output_port.connected_ports():
|
||||
connected_node = connected_port.node()
|
||||
if hasattr(connected_node, 'receive_data'):
|
||||
try:
|
||||
# Attempt to convert to int if possible, else float
|
||||
data_int = int(data)
|
||||
connected_node.receive_data(data_int, source_port_name='Result')
|
||||
except ValueError:
|
||||
connected_node.receive_data(data, source_port_name='Result')
|
||||
|
||||
Reference in New Issue
Block a user