Hdui tree views now sort and uniquify children.

(Internal change: 2384269)

Author: blevin

extras/imaging/examples/hdui/dataSourceTreeWidget.cpp

@@ -26,6 +26,14 @@ PXR_NAMESPACE_OPEN_SCOPE
 namespace
 {
 
+// Helper function to sort and uniquie-ify container data source names.
+static std::set<TfToken, TfDictionaryLessThan>
+Hdui_GetSortedNames(HdContainerDataSourceHandle const& container)
+{
+    const auto names = container->GetNames();
+    return std::set<TfToken, TfDictionaryLessThan>(names.begin(), names.end());
+}
+
 class Hdui_DataSourceTreeWidgetItem : public QTreeWidgetItem
 {
 public:
@@ -128,7 +136,7 @@ class Hdui_DataSourceTreeWidgetItem : public QTreeWidgetItem
 
                 // add any new items
                 for (const TfToken &childName :
-                        containerDataSource->GetNames()) {
+                     Hdui_GetSortedNames(containerDataSource)) {
                     if (usedNames.find(childName) == usedNames.end()) {
 
                         if (HdDataSourceBaseHandle childDs =
@@ -228,7 +236,7 @@ class Hdui_DataSourceTreeWidgetItem : public QTreeWidgetItem
                 HdContainerDataSource::Cast(_dataSource)) {
             TfDenseHashSet<TfToken, TfHash> usedNames;
 
-            for (const TfToken &childName : container->GetNames()) {
+            for (const TfToken &childName : Hdui_GetSortedNames(container)) {
                 if (usedNames.find(childName) != usedNames.end()) {
                     continue;
                 }
@@ -332,7 +340,7 @@ HduiDataSourceTreeWidget::SetPrimDataSource(const SdfPath &primPath,
             HdContainerDataSource::Cast(dataSource)) {
             // add all container children as roots
             TfDenseHashSet<TfToken, TfHash> usedNames;
-            for (TfToken const& childName: container->GetNames()) {
+            for (TfToken const& childName: Hdui_GetSortedNames(container)) {
                 if (usedNames.find(childName) != usedNames.end()) {
                     continue;
                 }

extras/imaging/examples/hdui/sceneIndexTreeWidget.cpp

@@ -81,8 +81,12 @@ class Hdui_SceneIndexPrimTreeWidgetItem : public QTreeWidgetItem
             return;
         }
 
-        for (const SdfPath &childPath :
-                treeWidget->_inputSceneIndex->GetChildPrimPaths(_primPath)) {
+        // Put child prim paths into a set to put them in order and ensure uniqueness.
+        const auto childPathVec =
+            treeWidget->_inputSceneIndex->GetChildPrimPaths(_primPath);
+        const SdfPathSet sortedChildPaths(childPathVec.begin(), childPathVec.end());
+
+        for (const SdfPath &childPath : sortedChildPaths) {
 
             HdSceneIndexPrim prim =
                 treeWidget->_inputSceneIndex->GetPrim(childPath);