From 1aab755cd5eb595df55ab2520fe6cef315a722c2 Mon Sep 17 00:00:00 2001
From: Alister <maguire7@llnl.gov>
Date: Fri, 13 Sep 2019 13:41:59 -0700
Subject: [PATCH] resolving global id highlight issue (#3897)

* resolving global id highlight issue

* updating release notes

* changing to 3.0.2 release

* better notes

* fixing bad merge resolve
---
 src/avt/Queries/Pick/avtPickByZoneQuery.C     |  6 ++++-
 src/resources/help/en_US/relnotes3.0.2.html   |  1 +
 src/test/tests/queries/pick.py                | 22 +++++++++++++++++++
 .../queries/pick/GlobalHighlight_00.png       |  3 +++
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 test/baseline/queries/pick/GlobalHighlight_00.png

diff --git a/src/avt/Queries/Pick/avtPickByZoneQuery.C b/src/avt/Queries/Pick/avtPickByZoneQuery.C
index 711ade0211a..0f41e891f33 100644
--- a/src/avt/Queries/Pick/avtPickByZoneQuery.C
+++ b/src/avt/Queries/Pick/avtPickByZoneQuery.C
@@ -147,6 +147,10 @@ avtPickByZoneQuery::~avtPickByZoneQuery()
 //    Matt Larsen, July 19 08:29:l2 PDT 2017
 //    Added support for picking by label
 //
+//    Alister Maguire, Thu Sep 12 15:34:02 PDT 2019
+//    Make sure that the highlight extractor gets the local id, not the
+//    global one. 
+//
 // ****************************************************************************
 
 void
@@ -357,7 +361,7 @@ avtPickByZoneQuery::Execute(vtkDataSet *ds, const int dom)
         pickAtts.SetPickPoint(center);
     }
     
-    this->ExtractZonePickHighlights(origPick, ds, dom);
+    this->ExtractZonePickHighlights(zoneid, ds, dom);
 }
 
 
diff --git a/src/resources/help/en_US/relnotes3.0.2.html b/src/resources/help/en_US/relnotes3.0.2.html
index 3e787d48f6f..ac6859a1f56 100644
--- a/src/resources/help/en_US/relnotes3.0.2.html
+++ b/src/resources/help/en_US/relnotes3.0.2.html
@@ -33,6 +33,7 @@
   <li>Corrected a bug with the Uintah reader where it would not load because the libxml2 could not be found.</li>
   <li>Corrected a bug where the GUI plot list goes blank on macOS.</li>
   <li>Corrected a bug where the VTK reader incorrectly set topological dimension of a dataset to 0, making the dataset undrawable by VisIt. This occured in a multiblock case where the first block contained neither points nor cells.</li>
+  <li>Corrected a bug with highlighting zones picked by their global ids. The highlighted cells were incorrect or non-existent before.</li>
   <li>Corrected a bug where the OriginalZoneLabels and OriginalNodeLabels variables appeared twice in the menu for Mili files.</li>
   <li>Corrected a viewer crash when glyphed points were scaled by a tensor.</li>
 </ul>
diff --git a/src/test/tests/queries/pick.py b/src/test/tests/queries/pick.py
index 1482e6d36f2..0beb979df6c 100644
--- a/src/test/tests/queries/pick.py
+++ b/src/test/tests/queries/pick.py
@@ -225,6 +225,9 @@
 #    Alister Maguire, Tue May 21 13:10:05 PDT 2019
 #    Updated tests that use mili to adhere to the plugin changes. 
 #
+#    Alister Maguire, Thu Sep 12 15:54:36 PDT 2019
+#    Add test for highlighting a zone picked by global id. 
+#
 # ----------------------------------------------------------------------------
 RequiredDatabasePlugin(("Boxlib2D","SAMRAI","Mili"))
 defaultAtts = GetPickAttributes()
@@ -2808,6 +2811,25 @@ def PickHighlight():
     Test("PickHighlight_01")
     DeleteAllPlots()
     ResetPickLetter()
+
+    OpenDatabase(silo_data_path("global_node.silo"))
+    AddPlot("Pseudocolor", "p")
+    DrawPlots()
+
+    # bug '3880 -- global id highlights incorrect cell. 
+    origAtts = GetPickAttributes()
+    pickAtts = origAtts
+    pickAtts.showPickHighlight = 1
+    pickAtts.showPickLetter = 1
+    SetPickAttributes(pickAtts)
+
+    PickByGlobalZone(236919)
+    Test("GlobalHighlight_00")
+
+    SetPickAttributes(origAtts)
+    DeleteAllPlots()
+    ResetPickLetter()
+
     #restore the attributes
     annotAtts  = GetAnnotationAttributes() 
     annotAtts.userInfoFlag = 1
diff --git a/test/baseline/queries/pick/GlobalHighlight_00.png b/test/baseline/queries/pick/GlobalHighlight_00.png
new file mode 100644
index 00000000000..bbb10f3f0c8
--- /dev/null
+++ b/test/baseline/queries/pick/GlobalHighlight_00.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d64239c2002513338e6e7f4427ff7256f752c497b4caa8001e618c325be4d10d
+size 1096