fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge develop --> portfolio-management

Browse Source 
This commit and next resolve conflicts with the aforementioned merge

possible unstashed new files have slipped through to p-m branch with these commits
This commit is contained in:
Philip Love committed 2021-11-26 14:12:02 -05:00
2 parents 1be6670171 7fd8bc825c
commit 67fccaae2d
225 files changed
+53365 -13616
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Projects/Visual-Scripting/TS/Utilities/NodeFunctions.js → Projects/Visual-Scripting/SA/Utilities/NodeFunctions.js
+9 -5
View File
@@ -12,11 +12,15 @@ exports.newVisualScriptingUtilitiesNodeFunctions = function () {
function nodeBranchToArray(node, nodeType) {
let resultArray = []
scanNodeBranch(node, nodeType)
scanNodeBranch(node)
return resultArray
function scanNodeBranch(startingNode) {
let schemaDocument = TS.projects.foundations.globals.taskConstants.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type)
if (startingNode === undefined) {
return
}
let schemaDocument = SA.projects.foundations.globals.schemas.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type)
if (schemaDocument === undefined) { return }
if (startingNode.type === nodeType) {
@@ -53,14 +57,14 @@ exports.newVisualScriptingUtilitiesNodeFunctions = function () {
returns the first instance found.
*/
let nodeFound
scanNodeMesh(node, nodeType)
scanNodeMesh(node)
return nodeFound
function scanNodeMesh(startingNode) {
if (startingNode === undefined) { return }
if (nodeFound !== undefined) { return }
let schemaDocument = TS.projects.foundations.globals.taskConstants.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type)
let schemaDocument = SA.projects.foundations.globals.schemas.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type)
if (schemaDocument === undefined) { return }
if (startingNode.type === nodeType) {
@@ -114,7 +118,7 @@ exports.newVisualScriptingUtilitiesNodeFunctions = function () {
function scanNodeMesh(startingNode) {
if (startingNode === undefined) { return }
let schemaDocument = TS.projects.foundations.globals.taskConstants.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type)
let schemaDocument = SA.projects.foundations.globals.schemas.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type)
if (schemaDocument === undefined) { return }
if (startingNode.id === nodeId) {