National Instruments Corporation

Jonathan P Fournie

Mohammed Kamran Shah

Ray Hsu

Yixin Guo

Duncan Hudson

Duncan G Hudson, Iii

System and method for merging differences between graphical programs. Information is received regarding matches and differences, e.g., in hardware, software, configuration, and/or connectivity, between first and second graphical programs, each comprising respective pluralities of interconnected nodes. The information is analyzed to merge differences between the first and second graphical programs, e.g., for each difference: removing all non-common nodes and connections thereto in the second sub-graph from the second graphical program, adding all common nodes and connections thereto in the first sub-graph to the second graphical program, determining all edges in the first sub-graph that connect common nodes to non-common nodes; and for each determined edge, adding to the second graphical program an edge that connects a corresponding common node in the second sub-graph with a corresponding non-common node added from the first sub-graph. A merged graphical program is displayed on a display, e.g., graphically indicating the merged matches and/or differences.

Automatically merging graphical programs

System and method for merging graphical programs. Information is received regarding first, second, and third graphical programs, where the third graphical program is an ancestor graphical program of the first and second. The information is analyzed to determine differences among the graphical programs. The first and second graphical programs are merged based on the determined differences, generating a merged graphical program, which is displayed. The analyzing may include determining first differences between the first and third graphical programs, and determining second differences between the second and third graphical programs, where the merging includes: for each of at least a subset of the differences: if the difference does not conflict with any other differences, incorporating the difference into the merged graphical program; and if the difference conflicts with another difference, prompting the user to resolve the conflict, receiving user input resolving the conflict, and modifying the merged graphical program accordingly.

Merging graphical programs based on an ancestor graphical program

Merging graphical programs

System and method for creating a scene graph. A data flow diagram is created in response to input, including displaying a first plurality of nodes on a display which are executable to create at least a portion of the scene graph, and connecting the nodes to create the data flow diagram, where the nodes are connected to specify data flow among the plurality of nodes. The data flow diagram is executed to create the scene graph. The scene graph specifies a plurality of objects and relationships between the objects, e.g., via an object hierarchy, and is usable in rendering a graphical image of the plurality of objects, e.g., a 3D scene. The scene graph is stored in a memory medium. At least one render node may be included in the data flow diagram which receives the scene graph as an input and renders the image based on the scene graph.

Growing community of inventors

Austin, TX, United States of America

Jonathan P Fournie