cwFlowTypes.h/cpp : Added 'owner_proc' and 'polyN' to network_t.

This commit is contained in:
kevin 2024-12-23 16:31:32 -05:00
parent f7d23b40ce
commit 88ae8bd0e4
2 changed files with 11 additions and 10 deletions

View File

@ -530,12 +530,12 @@ namespace cw
{ {
switch( net_val->tid ) switch( net_val->tid )
{ {
case kPolyPresetValueTId: case kNetRefPresetValueTId:
_network_preset_print( net_val->u.npv.net_preset ); _network_preset_print( net_val->u.npv.net_preset );
break; break;
case kDirectPresetValueTId: case kDirectPresetValueTId:
cwLogPrint(" %s:%i %s:%i ch:%i ",cwStringNullGuard(net_val->u.pvv.proc->label),net_val->u.pvv.proc->label_sfx_id,cwStringNullGuard(net_val->u.pvv.var->label),net_val->u.pvv.var->label_sfx_id,net_val->u.pvv.var->chIdx); cwLogPrint(" %s:%i %s:%i ch:%i pidx:%i",cwStringNullGuard(net_val->u.pvv.proc->label),net_val->u.pvv.proc->label_sfx_id,cwStringNullGuard(net_val->u.pvv.var->label),net_val->u.pvv.var->label_sfx_id,net_val->u.pvv.var->chIdx,net_val->u.pvv.pairTblIdx);
value_print( &net_val->u.pvv.value ); value_print( &net_val->u.pvv.value );
cwLogPrint("\n"); cwLogPrint("\n");
break; break;

View File

@ -151,16 +151,15 @@ namespace cw
unsigned pairTblIdx; // Index into the preset pair table for this preset value unsigned pairTblIdx; // Index into the preset pair table for this preset value
} proc_var_value_t; } proc_var_value_t;
typedef struct net_preset_value_str typedef struct net_preset_ref_str
{ {
struct proc_str* net_preset_proc; // net_preset_proc->internal_net has the preset list which net_preset is part of.
struct network_str* net_preset_net; // poly net this preset will be applied to struct network_str* net_preset_net; // poly net this preset will be applied to
const network_preset_str* net_preset; // network_preset_t of presets const network_preset_str* net_preset; // network_preset_t of presets
} poly_preset_value_t; } net_preset_ref_t;
typedef enum { typedef enum {
kDirectPresetValueTId, kDirectPresetValueTId,
kPolyPresetValueTId, kNetRefPresetValueTId,
} preset_val_tid_t; } preset_val_tid_t;
@ -172,8 +171,8 @@ namespace cw
union union
{ {
proc_var_value_t pvv; // Direct proc/var/value tuples. proc_var_value_t pvv; // Direct proc/var/value tuples.
poly_preset_value_t npv; // Refers to a network_preset_t and a list of preset_values. net_preset_ref_t npv; // Refers to a network_preset_t and a list of preset_values.
} u; } u;
struct preset_value_str* link; struct preset_value_str* link;
@ -243,8 +242,10 @@ namespace cw
network_preset_pair_t* preset_pairA; network_preset_pair_t* preset_pairA;
unsigned preset_pairN; unsigned preset_pairN;
struct network_str* poly_link; const proc_t* owner_proc; // The proc which owns this network (null for top level network)
unsigned poly_idx; unsigned polyN; // Count of networks in poly net or 1 if not part of a poly net
unsigned poly_idx; // Index in poly net or 0 if polyN == 1
struct network_str* poly_link; // Link to next net in poly.
ui_net_t* ui_net; ui_net_t* ui_net;