Merge branch 'dev/nkendallbar/logic-small-fixes' into 'main'

Misc Small Fixes for Remix Logic System

See merge request lightspeedrtx/lightspeed-kit!1047

Author: nxkb

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - REMIX-4778: Added logic graph create/edit functionality to properties panels and graph editor
 - REMIX-4739: Add support for specific icons for the different logic node categories
 - REMIX-4576: Added icon support for prims tab
+- Small improvements for Remix Logic: added delete button, hid unused ui, stage manager refresh filtering
 
 ### Changed
 - Update hdremix and omni_core_materials to ext-822f7b6-main

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.1.0"
+version = "1.1.1"
 authors = ["Chris Grebeldinger <[email protected]>", "Dean Edmonds <[email protected]>", "Nicolas Kendall-Bar <[email protected]>"]
 repository = "https://gitlab-master.nvidia.com/lightspeedrtx/lightspeed-kit/-/tree/main/source/extensions/lightspeed.trex.logic.widget"
 keywords = ["graph", "logic", "component", "remix", "ui"]

source/extensions/lightspeed.trex.logic.widget/docs/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.1.1]
+### Removed
+- Removed Variables panel and Edit toolbar button from Logic Graph widget
+
 ## [1.1.0]
 ### Added
 - Added create and edit logic graph functionality with dialog support

source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_widget.py

@@ -121,6 +121,14 @@ def is_graph_editable(self, graph: og.Graph) -> bool:
             # Temporary fix for 2022.1 build
             return True
 
+    def on_build_catalog(self):
+        """Override: Build only the catalog for the graph widget, without the variables widget or any tabs."""
+        with ui.VStack(spacing=4):
+            self._catalog_frame = ui.Frame()
+            with self._catalog_frame:
+                # Skip OmniGraphWidget's on_build_catalog to avoid building the variables widget
+                super(OmniGraphWidget, self).on_build_catalog()  # noqa: PLE1003
+
     def on_build_startup(self):
         """Overridden from base to customize startup panel UI"""
         with ui.ZStack():

source/extensions/lightspeed.trex.logic.widget/lightspeed/trex/logic/widget/graph_window.py

@@ -32,6 +32,13 @@ def on_build_window(self):
             filter_fn=self._filter_fn,
         )
 
+        # Hack: Remove the Edit Graph button from the toolbar
+        # (reasons: confusing with edit graph option, exposes omnigraph specific preference settings and
+        # cleanup variables menu option)
+        toolbar_items = self._main_widget._GraphEditorCoreWidget__toolbar_items  # noqa: protected-access
+        toolbar_items = [i for i in toolbar_items if i["name"] != "Edit"]
+        self._main_widget.set_toolbar_items(toolbar_items)
+
     def get_graph_widget(self) -> RemixLogicGraphWidget:
         """Get the graph widget"""
         return self._main_widget

source/extensions/lightspeed.trex.properties_pane.logic.widget/config/extension.toml

@@ -1,5 +1,5 @@
 [package]
-version = "1.1.0"
+version = "1.2.0"
 authors = ["Nicolas Kendall-Bar <[email protected]>"]
 title = "Remix Logic Properties Widget"
 description = "Properties panel for RemixLogic prim types"

source/extensions/lightspeed.trex.properties_pane.logic.widget/docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.2.0]
+### Added
+- Added Delete button for logic graphs in properties panel
+
 ## [1.1.0]
 ### Added
 - Added create and edit logic graph buttons to properties panel

source/extensions/lightspeed.trex.properties_pane.logic.widget/lightspeed/trex/properties_pane/logic/widget/setup_ui.py

@@ -24,6 +24,7 @@
 import omni.graph.core as og
 import omni.graph.tools.ogn as ogn
 import omni.kit
+import omni.kit.commands
 import omni.ui as ui
 import omni.usd
 from lightspeed.common.constants import OMNI_GRAPH_NODE_TYPE, GlobalEventNames
@@ -161,7 +162,7 @@ def _build_root_frame(self) -> None:
                 for graph in existing_graphs:
                     with ui.HStack(height=ui.Pixel(24), spacing=0):
                         relative_path = self._get_relative_path(graph.GetPath(), self._valid_target_paths)
-                        ui.Label(f"Existing Graph: {relative_path}", elided_text=True, name="PropertiesWidgetLabel")
+                        ui.Label(f"{relative_path}", elided_text=True, name="PropertiesWidgetLabel")
                         ui.Spacer(width=0)
                         ui.Button(
                             "Edit",
@@ -170,6 +171,14 @@ def _build_root_frame(self) -> None:
                             enabled=True,
                             width=ui.Pixel(80),
                         )
+                        ui.Spacer(width=0)
+                        ui.Button(
+                            "Delete",
+                            clicked_fn=partial(self._delete_logic_graph, graph),
+                            tooltip=f"Delete the logic graph: {graph.GetPath()}",
+                            enabled=True,
+                            width=ui.Pixel(80),
+                        )
 
                 if self._paths and self._show_node_properties:
                     # A logic node is selected, so show node info and the property widget
@@ -444,6 +453,13 @@ def _edit_logic_graph(self, graph: Usd.Prim) -> None:
         """Edit the given logic graph."""
         self._event_manager.call_global_custom_event(GlobalEventNames.LOGIC_GRAPH_EDIT_REQUEST.value, graph)
 
+    def _delete_logic_graph(self, graph: Usd.Prim) -> None:
+        """Delete the given logic graph."""
+        omni.kit.commands.execute("DeletePrimsCommand", paths=[str(graph.GetPath())])
+        # Rebuild the UI to reflect the changes in the existing logic graphs
+        if self._root_frame:
+            self._root_frame.rebuild()
+
     @property
     def property_model(self):
         return self._property_model

source/extensions/omni.flux.stage_manager.plugin.interaction.usd/config/extension.toml

@@ -1,6 +1,6 @@
 [package]
 # Semantic Versionning is used: https://semver.org/
-version = "2.4.0"
+version = "2.5.0"
 
 # Lists people or organizations that are considered the "authors" of the package.
 authors = ["Pierre-Olivier Trottier <[email protected]>"]

source/extensions/omni.flux.stage_manager.plugin.interaction.usd/docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [2.5.0]
+### Added
+- Added `ignore_property_prefix_events` to filter stage manager refresh for "ui:" prefixed properties by default
+
 ## [2.4.0]
 ### Added
 - Added `DeleteRestoreActionWidgetPlugin`