From d175b347b6d27f68f40d5325931211bc6bfbc8c8 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 4 Nov 2016 20:50:13 +0000
Subject: [PATCH] PVblockMeshReader: Added "Refresh" button to update the
 blockMesh

Reconstructs the blockMesh and updates the display from the current
blockMeshDict so that any changes can viewed without exiting
paraFoam -block
---
 .../PVFoamReader/pqPVFoamReaderPanel.h        |  4 --
 .../PVblockMeshReader_SM.xml                  | 14 +++++++
 .../pqPVblockMeshReaderPanel.cxx              | 39 +++++++++++++++++--
 .../pqPVblockMeshReaderPanel.h                |  5 +--
 .../vtkPVblockMeshReader.cxx                  | 34 ++++++++--------
 .../PVblockMeshReader/vtkPVblockMeshReader.h  |  3 ++
 6 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h
index 2bdeaa6028..6ca0f3f7a5 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/pqPVFoamReaderPanel.h
@@ -106,10 +106,6 @@ public:
 
         //- Construct from components
         pqPVFoamReaderPanel(pqProxy*, QWidget*);
-
-
-    //- Destructor
-    // virtual ~pqPVFoamReaderPanel();
 };
 
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader_SM.xml b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader_SM.xml
index 3a80fe5136..a351ef2658 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader_SM.xml
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/PVblockMeshReader_SM.xml
@@ -43,6 +43,20 @@
       </Documentation>
     </IntVectorProperty>
 
+    <!-- Refresh button -->
+    <IntVectorProperty
+      name="UiRefresh"
+      command="SetRefresh"
+      number_of_elements="1"
+      is_internal="0"
+      default_values="0"
+      animateable="0">
+      <BooleanDomain name="bool"/>
+      <Documentation>
+        Rescan for updated blockMeshDict.
+      </Documentation>
+    </IntVectorProperty>
+
 
     <!--
        | Selections
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.cxx
index 70b1489dd0..06f0db328d 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.cxx
@@ -58,12 +58,30 @@ pqPVblockMeshReaderPanel::pqPVblockMeshReaderPanel
 :
     pqAutoGeneratedObjectPanel(proxy, p)
 {
-    // create first sublayout (at top of the panel)
+    // Create first sublayout (at top of the panel)
     QGridLayout *form = new QGridLayout();
     this->PanelLayout->addLayout(form, 0, 0, 1, -1);
 
     vtkSMProperty* prop = 0;
-    // checkbox for showing point numbers
+
+    // Refresh button for updating blocks
+    if ((prop = this->proxy()->GetProperty("UiRefresh")) != 0)
+    {
+        prop->SetImmediateUpdate(1);
+        QPushButton* refresh = new QPushButton("Refresh");
+        refresh->setToolTip("Rescan for updated blockMeshDict.");
+
+        form->addWidget(refresh, 0, 0, Qt::AlignLeft);
+        QObject::connect
+        (
+            refresh,
+            SIGNAL(clicked()),
+            this,
+            SLOT(RefreshPressed())
+        );
+    }
+
+    // Checkbox for showing point numbers
     if ((prop = this->proxy()->GetProperty("UiShowPointNumbers")) != 0)
     {
         prop->SetImmediateUpdate(true);
@@ -97,7 +115,7 @@ void pqPVblockMeshReaderPanel::ShowPointNumbersToggled()
         this->proxy()->GetProperty("UiShowPointNumbers")
     )->SetElement(0, ShowPointNumbers_->isChecked());
 
-    // update the active view
+    // Update the active view
     if (this->view())
     {
         this->view()->render();
@@ -107,4 +125,19 @@ void pqPVblockMeshReaderPanel::ShowPointNumbersToggled()
 }
 
 
+void pqPVblockMeshReaderPanel::RefreshPressed()
+{
+    // Update everything
+    vtkSMIntVectorProperty::SafeDownCast
+    (
+        this->proxy()->GetProperty("UiRefresh")
+    )->Modified();
+
+    vtkSMSourceProxy::SafeDownCast(this->proxy())->UpdatePipeline();
+
+    // Render all views
+    pqApplicationCore::instance()->render();
+}
+
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.h b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.h
index f6a8acf247..4c15bc374e 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/pqPVblockMeshReaderPanel.h
@@ -67,6 +67,7 @@ class pqPVblockMeshReaderPanel
 protected slots:
 
     void ShowPointNumbersToggled();
+    void RefreshPressed();
 
 
 public:
@@ -75,10 +76,6 @@ public:
 
         //- Construct from components
         pqPVblockMeshReaderPanel(pqProxy*, QWidget*);
-
-
-    //- Destructor
-    // virtual ~pqPVblockMeshReaderPanel();
 };
 
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
index ce5b4a309a..ff36abdf30 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.cxx
@@ -97,7 +97,7 @@ vtkPVblockMeshReader::~vtkPVblockMeshReader()
 
     if (foamData_)
     {
-        // remove point numbers
+        // Remove point numbers
         updatePointNumbersView(false);
         delete foamData_;
     }
@@ -117,7 +117,6 @@ vtkPVblockMeshReader::~vtkPVblockMeshReader()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-// Do everything except set the output info
 int vtkPVblockMeshReader::RequestInformation
 (
     vtkInformation* vtkNotUsed(request),
@@ -158,23 +157,10 @@ int vtkPVblockMeshReader::RequestInformation
         foamData_->updateInfo();
     }
 
-    // might need some other type of error handling
-
-//    {
-//        vtkErrorMacro("could not find valid OpenFOAM blockMesh");
-//
-//        // delete foamData and flag it as fatal error
-//        delete foamData_;
-//        foamData_ = nullptr;
-//        return 0;
-//    }
-
-
     return 1;
 }
 
 
-// Set the output info
 int vtkPVblockMeshReader::RequestData
 (
     vtkInformation* vtkNotUsed(request),
@@ -190,7 +176,7 @@ int vtkPVblockMeshReader::RequestData
         return 0;
     }
 
-    // catch previous error
+    // Catch previous error
     if (!foamData_)
     {
         vtkErrorMacro("Reader failed - perhaps no mesh?");
@@ -233,6 +219,18 @@ int vtkPVblockMeshReader::RequestData
 }
 
 
+void vtkPVblockMeshReader::SetRefresh(int val)
+{
+    // Delete the current blockMesh to force re-read and update
+    if (foamData_)
+    {
+        delete foamData_;
+        foamData_ = 0;
+    }
+
+    Modified();
+}
+
 
 void vtkPVblockMeshReader::SetShowPointNumbers(const int val)
 {
@@ -248,7 +246,7 @@ void vtkPVblockMeshReader::updatePointNumbersView(const bool show)
 {
     pqApplicationCore* appCore = pqApplicationCore::instance();
 
-    // need to check this, since our destructor calls this
+    // Need to check this, since our destructor calls this
     if (!appCore)
     {
         return;
@@ -273,7 +271,7 @@ void vtkPVblockMeshReader::updatePointNumbersView(const bool show)
         );
     }
 
-    // use refresh here?
+    // Use refresh here?
 }
 
 
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h
index a08c85acb4..01e1762578 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/vtkPVblockMeshReader.h
@@ -81,6 +81,9 @@ public:
     vtkSetMacro(UpdateGUI, int);
     vtkGetMacro(UpdateGUI, int);
 
+    // Description:
+    // Refresh blockMesh from changes to blockMeshDict
+    virtual void SetRefresh(int);
 
     // Description:
     // Blocks selection list control