Merge topic 'fix-multi-block-issues'

ebf184d Fix bug when setting color for multi-block data sets ddb0cdf Add 'Show All Blocks' button to context-menu
matthb2 · May 24, 2013 · 6f72060 · 6f72060
2 parents c80f93f + ebf184d
commit 6f72060
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/Qt/ApplicationComponents/pqPipelineContextMenuBehavior.cxx b/Qt/ApplicationComponents/pqPipelineContextMenuBehavior.cxx
@@ -246,6 +246,11 @@ void pqPipelineContextMenuBehavior::buildMenu(pqDataRepresentation* repr,
       this->connect(showOnlyBlockAction, SIGNAL(triggered()),
                     this, SLOT(showOnlyBlock()));
 
+      QAction *showAllBlocksAction =
+        this->Menu->addAction("Show All Blocks");
+      this->connect(showAllBlocksAction, SIGNAL(triggered()),
+                    this, SLOT(showAllBlocks()));
+
       QAction *unsetVisibilityAction =
         this->Menu->addAction(QString("Unset Block %1")
             .arg(multipleBlocks ? "Visibilities" : "Visibility"));
@@ -491,6 +496,16 @@ void pqPipelineContextMenuBehavior::showOnlyBlock()
     }
 }
 
+//-----------------------------------------------------------------------------
+void pqPipelineContextMenuBehavior::showAllBlocks()
+{
+  pqMultiBlockInspectorPanel *panel = getMultiBlockInspectorPanel();
+  if (panel)
+    {
+    panel->showAllBlocks();
+    }
+}
+
 //-----------------------------------------------------------------------------
 void pqPipelineContextMenuBehavior::unsetBlockVisibility()
 {
@@ -520,7 +535,10 @@ void pqPipelineContextMenuBehavior::setBlockColor()
   if (panel)
     {
     QColor color = QColorDialog::getColor(Qt::gray);
-    panel->setBlockColor(this->PickedBlocks, color);
+    if(color.isValid())
+      {
+      panel->setBlockColor(this->PickedBlocks, color);
+      }
     }
 }
 

diff --git a/Qt/ApplicationComponents/pqPipelineContextMenuBehavior.h b/Qt/ApplicationComponents/pqPipelineContextMenuBehavior.h
@@ -75,6 +75,9 @@ protected slots:
   /// signal will contain the block index in its data().
   void showOnlyBlock();
 
+  /// called to show all blocks.
+  void showAllBlocks();
+
   /// called to unset the visibility flag for the block. after this call the
   /// block will inherit the visibility from its parent. the action which
   /// emits the signal will contain the block index in its data()

diff --git a/Qt/Components/pqMultiBlockInspectorPanel.cxx b/Qt/Components/pqMultiBlockInspectorPanel.cxx
@@ -435,6 +435,15 @@ void pqMultiBlockInspectorPanel::showOnlyBlock(unsigned int index)
   this->showOnlyBlocks(indices);
 }
 
+//-----------------------------------------------------------------------------
+void pqMultiBlockInspectorPanel::showAllBlocks()
+{
+  this->BlockVisibilites.clear();
+  this->BlockVisibilites[0] = true; // show root block
+  this->updateBlockVisibilities();
+  this->Representation->renderViewEventually();
+}
+
 //-----------------------------------------------------------------------------
 void pqMultiBlockInspectorPanel::showOnlyBlocks(
   const QList<unsigned int>& indices)

diff --git a/Qt/Components/pqMultiBlockInspectorPanel.h b/Qt/Components/pqMultiBlockInspectorPanel.h
@@ -70,6 +70,7 @@ public slots:
 
   void showOnlyBlock(unsigned int index);
   void showOnlyBlocks(const QList<unsigned int>& indices);
+  void showAllBlocks();
 
 private slots:
   void treeWidgetCustomContextMenuRequested(const QPoint &pos);