Merge pull request #858 from SCIInstitute/sort_object_list

Closes #841

Author: dcwhite

src/Interface/Modules/Render/ViewScene.cc

@@ -46,7 +46,7 @@ using namespace SCIRun::Render;
 //------------------------------------------------------------------------------
 ViewSceneDialog::ViewSceneDialog(const std::string& name, ModuleStateHandle state,
 	QWidget* parent /* = 0 */)
-	: ModuleDialogGeneric(state, parent), mConfigurationDock(0), shown_(false),
+  : ModuleDialogGeneric(state, parent), mConfigurationDock(0), shown_(false), itemValueChanged_(true),
 	itemManager_(new ViewSceneItemManager)
 {
   setupUi(this);
@@ -118,9 +118,7 @@ void ViewSceneDialog::newGeometryValue()
   Guard lock(SCIRun::Modules::Render::ViewScene::mutex_.get());
 
   LOG_DEBUG("ViewSceneDialog::asyncExecute after locking");
-
-  itemManager_->removeAll();
-
+  
   std::shared_ptr<Render::SRInterface> spire = mSpire.lock();
   if (spire == nullptr)
     return;
@@ -144,23 +142,44 @@ void ViewSceneDialog::newGeometryValue()
     }
 
     int port = 0;
+    std::vector<std::string>objectNames;
     std::vector<std::string> validObjects;
     for (auto it = geomData->begin(); it != geomData->end(); ++it, ++port)
     {
       boost::shared_ptr<Core::Datatypes::GeometryObject> obj = *it;
-      auto displayName = QString::fromStdString(obj->objectName).split('_').first();
-      if (isObjectUnselected(obj->objectName))
-      {
-        itemManager_->addItem(QString::fromStdString(obj->objectName), displayName, false);
-      }
-      else
+      objectNames.push_back(obj->objectName);
+      if (!isObjectUnselected(obj->objectName))
       {
         spire->handleGeomObject(obj, port);
         validObjects.push_back(obj->objectName);
-        itemManager_->addItem(QString::fromStdString(obj->objectName), displayName, true);
       }
     }
     spire->gcInvalidObjects(validObjects);
+
+    std::sort(objectNames.begin(), objectNames.end());
+    if (previousObjectNames_ != objectNames)
+    {
+      itemValueChanged_ = true;
+      previousObjectNames_ = objectNames;
+    }
+    if (itemValueChanged_)
+    {
+      itemManager_->removeAll();
+      for (auto it = objectNames.begin(); it != objectNames.end(); ++it)
+      {
+        std::string name = *it;
+        auto displayName = QString::fromStdString(name).split('_').first();
+        if (isObjectUnselected(name))
+        {
+          itemManager_->addItem(QString::fromStdString(name), displayName, false);
+        }
+        else
+        {
+          itemManager_->addItem(QString::fromStdString(name), displayName, true);
+        }
+      }
+      itemValueChanged_ = false;
+    }
   }
   else
   {
@@ -403,13 +422,15 @@ void ViewSceneDialog::assignBackgroundColor()
 //------------------------------------------------------------------------------
 void ViewSceneDialog::handleUnselectedItem(const QString& name)
 {
+  itemValueChanged_ = true;
   unselectedObjectNames_.push_back(name.toStdString());
   newGeometryValue();
 }
 
 //------------------------------------------------------------------------------
 void ViewSceneDialog::handleSelectedItem(const QString& name)
 {
+  itemValueChanged_ = true;
   unselectedObjectNames_.erase(std::remove(unselectedObjectNames_.begin(), unselectedObjectNames_.end(), name.toStdString()), unselectedObjectNames_.end());
   newGeometryValue();
 }

src/Interface/Modules/Render/ViewScene.h

@@ -118,8 +118,10 @@ namespace SCIRun {
       bool shown_;
       bool hideViewBar_;
       bool showConfiguration_;
+      bool itemValueChanged_;
       std::shared_ptr<class ViewSceneItemManager> itemManager_;
       std::vector<std::string> unselectedObjectNames_;
+      std::vector<std::string> previousObjectNames_;
 
       friend class ViewSceneControlsDock;
 		};