Merge branch 'dev/ptrottier/logic_fixes' into 'main'

SmokedPete · SmokedPete · commit df880be809af · 2025-12-09T15:55:53.000-08:00
REMIX-4715, REMIX-4826: Improve "Select Graph to Edit" window &amp; Removed Compound Graphs

See merge request lightspeedrtx/lightspeed-kit!1057
diff --git a/.cursor/commands/bump-exts-changelog.md b/.cursor/commands/bump-exts-changelog.md
@@ -21,9 +21,11 @@ The commit messages might or might not have relevant info to the changelog.
 This info should be used to:
 1. Bump the version string using semver in the ext/config/extension.toml file to be the next available version, inferring from the diff if it is a major, minor or patch bump.
 2. Write very concise, one-liner changelog entries to Added, Changed, Fixed, or Removed sections of the <ext-name>/docs/CHANGELOG.md file, following the history of writing style from previous entries or other exts changelog style.
+3. Ensure there is an empty line below the added section (there should always be an empty line between version sections).
 
 Remember: These changelogs might also be used by marketing to generate release notes, so the oneliners should target both end users and the developers as applicable.
 Go back to step 2 for the next extension pending bumps until all are done.
 
 ## Step 4
-Update the main project ./CHANGELOG.md file with a concise one line summary of all the changes made in this branch. Place it at the end of the [Unreleased] section under the appropriate heading.
+Update the main project ./CHANGELOG.md file with a concise one line summary of all the changes made in this branch. Place it at the END of the [Unreleased] section under the appropriate heading. (it should be the last item in the Added, Changed, Fixed, or Removed section of the Unreleased section)
+You should always add the Jira ticket number at the start of the line, using the following format: `REMIX-1234: <one-liner summary>`. If you don't know the Jira ticket number, ask the user to provide it.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update hdremix and omni_core_materials to ext-a9cbe4d-main
 - REMIX-4798: Logic Graph Editor: Improved node + port tooltips and added documentation links
 - REMIX-4812: OV Property Window is no longer accessible via the Windows/Property sub menu button
+- REMIX-4715, REMIX-4826: Improved Edit Graph dialog with tree-based selection UI and disabled compound graphs
 
 ### Fixed
 - Improved Pyright configuration by generating a list of search paths
diff --git a/source/extensions/lightspeed.common/config/extension.toml b/source/extensions/lightspeed.common/config/extension.toml
@@ -1,6 +1,6 @@
 [package]
 # Semantic Versioning is used: https://semver.org/
-version = "1.14.1"
+version = "1.14.2"
 
 # Lists people or organizations that are considered the "authors" of the package.
 authors = ["Alexander Jaus <ajaus@nvidia.com>"]
diff --git a/source/extensions/lightspeed.common/docs/CHANGELOG.md b/source/extensions/lightspeed.common/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.14.2]
+### Changed
+- Renamed "Remix Logic Graph Editor" window to "Logic Graph" for consistency
+
 ## [1.14.1]
 ### Added
 - Added `LOGIC_GRAPH` layout file constant for Logic Graph window layout
diff --git a/source/extensions/lightspeed.common/lightspeed/common/constants.py b/source/extensions/lightspeed.common/lightspeed/common/constants.py
@@ -592,7 +592,7 @@ class WindowNames(str, Enum):
     TEXTURECRAFT = "AI Tools"
     PROJECT_SETUP = "Project Setup"
     CAPTURES = "Captures"
-    REMIX_LOGIC_GRAPH = "Remix Logic Graph Editor"
+    REMIX_LOGIC_GRAPH = "Logic Graph"
     COMFYUI = "ComfyUI"
 
 
diff --git a/source/extensions/lightspeed.trex.app.resources/config/extension.toml b/source/extensions/lightspeed.trex.app.resources/config/extension.toml
@@ -1,5 +1,5 @@
 [package]
-version = "1.27.0"
+version = "1.27.1"
 authors = ["dbataille@nvidia.com"]
 repository = "https://gitlab-master.nvidia.com/lightspeedrtx/lightspeed-kit"
 changelog = "docs/CHANGELOG.md"
diff --git a/source/extensions/lightspeed.trex.app.resources/data/layouts/home_page_default_layout.json b/source/extensions/lightspeed.trex.app.resources/data/layouts/home_page_default_layout.json
@@ -56,7 +56,7 @@
     "position_x": 434.0,
     "position_y": 26.0,
     "selected_in_dock": false,
-    "title": "Remix Logic Graph Editor",
+    "title": "Logic Graph",
     "visible": false,
     "width": 1366.0
   },
diff --git a/source/extensions/lightspeed.trex.app.resources/data/layouts/ingestcraft_default_layout.json b/source/extensions/lightspeed.trex.app.resources/data/layouts/ingestcraft_default_layout.json
@@ -67,7 +67,7 @@
     "position_x": 434.0,
     "position_y": 26.0,
     "selected_in_dock": false,
-    "title": "Remix Logic Graph Editor",
+    "title": "Logic Graph",
     "visible": false,
     "width": 1366.0
   },
diff --git a/source/extensions/lightspeed.trex.app.resources/data/layouts/logic_default_layout.json b/source/extensions/lightspeed.trex.app.resources/data/layouts/logic_default_layout.json
@@ -49,7 +49,7 @@
                     "position_x": 555.2000122070312,
                     "position_y": 24.80000114440918,
                     "selected_in_dock": true,
-                    "title": "Remix Logic Graph Editor",
+                    "title": "Logic Graph",
                     "visible": true,
                     "width": 1060.800048828125
                   }
diff --git a/source/extensions/lightspeed.trex.app.resources/data/layouts/packaging_default_layout.json b/source/extensions/lightspeed.trex.app.resources/data/layouts/packaging_default_layout.json
@@ -67,7 +67,7 @@
     "position_x": 434.0,
     "position_y": 26.0,
     "selected_in_dock": false,
-    "title": "Remix Logic Graph Editor",
+    "title": "Logic Graph",
     "visible": false,
     "width": 1366.0
   },
diff --git a/source/extensions/lightspeed.trex.app.resources/data/layouts/stagecraft_default_layout.json b/source/extensions/lightspeed.trex.app.resources/data/layouts/stagecraft_default_layout.json
@@ -79,7 +79,7 @@
                     "position_x": 555.2000122070312,
                     "position_y": 24.80000114440918,
                     "selected_in_dock": false,
-                    "title": "Remix Logic Graph Editor",
+                    "title": "Logic Graph",
                     "visible": true,
                     "width": 1060.800048828125
                   }
diff --git a/source/extensions/lightspeed.trex.app.resources/data/layouts/texturecraft_default_layout.json b/source/extensions/lightspeed.trex.app.resources/data/layouts/texturecraft_default_layout.json
@@ -67,7 +67,7 @@
     "position_x": 434.0,
     "position_y": 26.0,
     "selected_in_dock": false,
-    "title": "Remix Logic Graph Editor",
+    "title": "Logic Graph",
     "visible": false,
     "width": 1366.0
   },
diff --git a/source/extensions/lightspeed.trex.app.resources/docs/CHANGELOG.md b/source/extensions/lightspeed.trex.app.resources/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.27.1]
+### Fixed
+- Fixed Logic Graph Editor window title to "Logic Graph"
+
 ## [1.27.0]
 ### Added
 - Added Logic Graph dedicated layout configuration file
diff --git a/source/extensions/lightspeed.trex.logic.widget/config/extension.toml b/source/extensions/lightspeed.trex.logic.widget/config/extension.toml
@@ -1,7 +1,7 @@
 [package]
 title = "Remix Logic Graph Editor"
 description = "Component editor window for Remix Component Graphs"
-version = "1.4.0"
+version = "1.5.0"
 authors = ["Chris Grebeldinger <cgrebeldinge@nvidia.com>", "Dean Edmonds <dedmonds@nvidia.com>", "Nicolas Kendall-Bar <nkendallbar@nvidia.com>"]
 repository = "https://gitlab-master.nvidia.com/lightspeedrtx/lightspeed-kit/-/tree/main/source/extensions/lightspeed.trex.logic.widget"
 keywords = ["graph", "logic", "component", "remix", "ui"]
@@ -22,11 +22,11 @@ icon = "data/icon.svg"
 "lightspeed.trex.utils.widget" = {}
 "omni.flux.utils.dialog" = {}
 "omni.flux.utils.widget" = {}
-"omni.graph" = { version = ">=1.139.0" }
 "omni.graph.core" = { version = ">=2.177.1" }
 "omni.graph.tools" = { version = ">=1.77.0" }
 "omni.graph.ui" = {version=">=1.5.0"}
 "omni.graph.window.core" = {version=">=1.80.0"}
+"omni.graph" = { version = ">=1.139.0" }
 "omni.kit.stage.copypaste" = {}  # for "omni.graph.window.core"
 "omni.ui" = {}
 "omni.usd" = {}
diff --git a/source/extensions/lightspeed.trex.logic.widget/docs/CHANGELOG.md b/source/extensions/lightspeed.trex.logic.widget/docs/CHANGELOG.md
@@ -4,6 +4,13 @@ This document records all notable changes to the **lightspeed.trex.logic.widget*
 
 The format is based on [Keep a Changelog](https://keepachangelog.com). The project adheres to [Semantic Versioning](https://semver.org).
 
+## [1.5.0]
+### Added
+- Added tree-based graph selection UI with improved UX for Edit Graph dialog
+
+### Changed
+- Disabled compound graphs feature in Remix Logic Graph
+
 ## [1.4.0]
 ### Added
 - Added sidebar button for quick access to Logic Graph layout
diff --git a/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/extension.py b/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/extension.py
@@ -47,6 +47,7 @@
 
 _extension_instance = None
 _original_show_help_for_node_type = None
+_original_are_compounds_enabled = None
 
 
 @lru_cache
@@ -152,6 +153,11 @@ def on_startup(self, ext_id: str):
         graph_operations.show_help_for_node_type = _remix_show_help_for_node_type
         graph_delegate.show_help_for_node_type = _remix_show_help_for_node_type
 
+        # Monkey patch Settings.are_compounds_enabled to disable compound graphs in Lightspeed
+        global _original_are_compounds_enabled
+        _original_are_compounds_enabled = graph_config.Settings.are_compounds_enabled
+        graph_config.Settings.are_compounds_enabled = staticmethod(lambda *args: False)
+
     def on_shutdown(self):
         global _extension_instance
         _extension_instance = None
@@ -187,6 +193,12 @@ def on_shutdown(self):
             graph_delegate.show_help_for_node_type = _original_show_help_for_node_type
             _original_show_help_for_node_type = None
 
+        # Restore original are_compounds_enabled
+        global _original_are_compounds_enabled
+        if _original_are_compounds_enabled is not None:
+            graph_config.Settings.are_compounds_enabled = _original_are_compounds_enabled
+            _original_are_compounds_enabled = None
+
     def show_window(self, value: bool):
         """Show/hide the window"""
         if value:
diff --git a/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_edit_tree/__init__.py b/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_edit_tree/__init__.py
@@ -0,0 +1,22 @@
+"""
+* SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+"""
+
+__all__ = ["GraphEditTreeDelegate", "GraphEditTreeItem", "GraphEditTreeModel"]
+
+from .delegate import GraphEditTreeDelegate
+from .items import GraphEditTreeItem
+from .model import GraphEditTreeModel
diff --git a/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_edit_tree/delegate.py b/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_edit_tree/delegate.py
@@ -0,0 +1,56 @@
+"""
+* SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+"""
+
+__all__ = ["GraphEditTreeDelegate"]
+
+from omni import ui
+from omni.flux.utils.widget.tree_widget import TreeDelegateBase
+
+from .items import GraphEditTreeItem
+from .model import GraphEditTreeModel
+
+
+class GraphEditTreeDelegate(TreeDelegateBase):
+    ROW_HEIGHT = TreeDelegateBase.DEFAULT_IMAGE_ICON_SIZE
+    SPACER_WIDTH_SM = ui.Pixel(4)
+
+    @property
+    def default_attr(self) -> dict[str, None]:
+        return super().default_attr
+
+    def build_branch(
+        self, model: GraphEditTreeModel, item: GraphEditTreeItem, column_id: int, level: int, expanded: bool
+    ):
+        return
+
+    def _build_widget(
+        self, model: GraphEditTreeModel, item: GraphEditTreeItem, column_id: int, level: int, expanded: bool
+    ):
+        with ui.HStack(height=self.ROW_HEIGHT):
+            ui.Spacer(width=self.SPACER_WIDTH_SM)
+            match column_id:
+                case 0:
+                    ui.Label(item.name, tooltip=item.prim_path)
+                case 1:
+                    ui.Label(item.parent_path, tooltip=item.prim_path, elided_text=True)
+                case _:
+                    return
+
+    def _build_header(self, column_id: int):
+        with ui.HStack(height=self.ROW_HEIGHT):
+            ui.Spacer(width=self.SPACER_WIDTH_SM)
+            ui.Label(GraphEditTreeModel.COLUMN_MAP.get(column_id, ""))
diff --git a/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_edit_tree/items.py b/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_edit_tree/items.py
@@ -0,0 +1,60 @@
+"""
+* SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+"""
+
+from __future__ import annotations
+
+__all__ = ["GraphEditTreeItem"]
+
+from typing import TYPE_CHECKING
+
+from omni.flux.utils.widget.tree_widget import TreeItemBase
+
+if TYPE_CHECKING:
+    from pxr import Sdf
+
+
+class GraphEditTreeItem(TreeItemBase):
+    def __init__(self, prim_path: Sdf.Path):
+        super().__init__()
+
+        self._prim_path = prim_path
+
+    @property
+    def default_attr(self) -> dict[str, None]:
+        default_attr = super().default_attr
+        default_attr.update(
+            {
+                "_prim_path": None,
+            }
+        )
+        return default_attr
+
+    @property
+    def can_have_children(self) -> bool:
+        return False
+
+    @property
+    def name(self) -> str:
+        return self._prim_path.name
+
+    @property
+    def parent_path(self) -> str:
+        return str(self._prim_path.GetParentPath())
+
+    @property
+    def prim_path(self) -> str:
+        return str(self._prim_path)
diff --git a/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_edit_tree/model.py b/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_edit_tree/model.py
@@ -0,0 +1,54 @@
+"""
+* SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+"""
+
+__all__ = ["GraphEditTreeModel"]
+
+import omni.graph.core as og
+from omni.flux.utils.widget.tree_widget import TreeModelBase
+from pxr import Sdf
+
+from .items import GraphEditTreeItem
+
+
+class GraphEditTreeModel(TreeModelBase[GraphEditTreeItem]):
+    COLUMN_MAP = {
+        0: "Graph Name",
+        1: "Parent Path",
+    }
+
+    @property
+    def default_attr(self) -> dict[str, None]:
+        return super().default_attr
+
+    def set_items(self, graphs: list[og.Graph]):
+        """
+        Set the items in the model to the given graphs
+
+        Args:
+            graphs: list of graphs to set in the model
+        """
+        self._items = [GraphEditTreeItem(Sdf.Path(graph.get_path_to_graph())) for graph in graphs]
+
+        self._item_changed(None)
+
+    def get_item_children(self, item: GraphEditTreeItem):
+        if item is None:
+            return self._items
+        return []
+
+    def get_item_value_model_count(self, item: GraphEditTreeItem) -> int:
+        return len(self.COLUMN_MAP.keys())
diff --git a/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_widget.py b/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_widget.py
diff --git a/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/tests/unit/test_graph_editor_window.py b/source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/tests/unit/test_graph_editor_window.py

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`"position_x": 555.2000122070312,`
`50`	`50`	`"position_y": 24.80000114440918,`
`51`	`51`	`"selected_in_dock": true,`
`52`		`- "title": "Remix Logic Graph Editor",`
	`52`	`+ "title": "Logic Graph",`
`53`	`53`	`"visible": true,`
`54`	`54`	`"width": 1060.800048828125`
`55`	`55`	`}`