Fix broken UGRID/large map and PRegionSelector edge case

apps/vaporgui/ImageEventRouter.cpp

@@ -29,7 +29,7 @@ ImageEventRouter::ImageEventRouter(QWidget *parent, ControlExec *ce) : RenderEve
         new PTMSLODInput()
     }));
 
-    AddGeometrySubtab(new PGeometrySubtab);
+    AddGeometrySubtab(new PGeometrySubtab(ce));
 
     // clang-format on
 }

apps/vaporgui/PGeometrySubtab.cpp

@@ -3,4 +3,4 @@
 #include "PCopyRegionWidget.h"
 #include "PTransformWidget.h"
 
-PGeometrySubtab::PGeometrySubtab() : PGroup({new PRegionSelector, new PCopyRegionWidget, new PRendererTransformSection}) {}
+PGeometrySubtab::PGeometrySubtab(VAPoR::ControlExec* ce) : PGroup({new PRegionSelector(ce), new PCopyRegionWidget, new PRendererTransformSection}) {}

apps/vaporgui/PGeometrySubtab.h

@@ -1,8 +1,9 @@
 #pragma once
 
 #include "PGroup.h"
+#include <vapor/ControlExecutive.h>
 
 class PGeometrySubtab : public PGroup {
 public:
-    PGeometrySubtab();
+    PGeometrySubtab(VAPoR::ControlExec* ce = nullptr);
 };

apps/vaporgui/PRegionSelector.cpp

@@ -6,14 +6,14 @@
 
 using namespace VAPoR;
 
-PRegionSelector::PRegionSelector(const std::string &label) : PSection(label)
+PRegionSelector::PRegionSelector(VAPoR::ControlExec* ce, const std::string &label) : PSection(label)
 {
-    Add(new PRegionSelectorX);
-    Add(new PRegionSelectorY);
-    Add(new PRegionSelectorZ);
+    Add(new PRegionSelectorX(ce));
+    Add(new PRegionSelectorY(ce));
+    Add(new PRegionSelectorZ(ce));
 }
 
-PRegionSelector1D::PRegionSelector1D(int dim) : PLineItem("", dim == 0 ? "X" : dim == 1 ? "Y" : "Z", _slider = new QRangeSliderTextCombo), _dim(dim)
+PRegionSelector1D::PRegionSelector1D(int dim, VAPoR::ControlExec* ce) : PLineItem("", dim == 0 ? "X" : dim == 1 ? "Y" : "Z", _slider = new QRangeSliderTextCombo), _dim(dim), _ce(ce)
 {
     QObject::connect(_slider, &QRangeSliderTextCombo::ValueChanged, this, &PRegionSelector1D::sliderValueChanged);
     _slider->AllowCustomRange();
@@ -29,6 +29,21 @@ void PRegionSelector1D::updateGUI() const
     int            lod = rp->GetCompressionLevel();
     string         varName = rp->GetFirstVariableName();
 
+    Box *box = getBox();
+
+    // In some cases (ImageRenderer), there may be no variable to configure extents with.
+    // Therefore, configure the sliders with the extents of the data domain, acquired from DataStatus 
+    if (varName == "") {
+        box->GetExtents(min, max);
+        _slider->SetValue(min[_dim], max[_dim]);
+        VAPoR::ParamsMgr* pm = _ce->GetParamsMgr();
+        VAPoR::DataStatus* ds = _ce->GetDataStatus();
+        VAPoR::CoordType minExts, maxExts;
+        ds->GetActiveExtents(pm, ts, minExts, maxExts);
+        _slider->SetRange(minExts[_dim], maxExts[_dim]);
+        return;
+    }
+
     int ret = getDataMgr()->GetVariableExtents(ts, varName, level, lod, min, max);
     if (ret < 0) {
         _slider->SetRange(0, 0);
@@ -38,7 +53,6 @@ void PRegionSelector1D::updateGUI() const
 
     _slider->SetRange(min[_dim], max[_dim]);
 
-    Box *box = getBox();
     box->GetExtents(min, max);
     _slider->SetValue(min[_dim], max[_dim]);
 }

apps/vaporgui/PRegionSelector.h

@@ -2,6 +2,7 @@
 
 #include "PSection.h"
 #include "PLineItem.h"
+#include <vapor/ControlExecutive.h>
 
 class QRangeSliderTextCombo;
 
@@ -12,17 +13,18 @@ class Box;
 //! \class PRegionSelector
 class PRegionSelector : public PSection {
 public:
-    PRegionSelector(const std::string &label = "Region");
+    PRegionSelector(VAPoR::ControlExec* ce= nullptr, const std::string &label = "Region");
 };
 
 class PRegionSelector1D : public PLineItem {
     QRangeSliderTextCombo *_slider;
     const int              _dim;
 
 public:
-    PRegionSelector1D(int dim);
+    PRegionSelector1D(int dim, VAPoR::ControlExec* ce = nullptr);
 
 protected:
+    VAPoR::ControlExec    *_ce;
     virtual void        updateGUI() const override;
     virtual bool        isShown() const override;
     virtual bool        requireDataMgr() const override { return true; }
@@ -34,7 +36,7 @@ class PRegionSelector1D : public PLineItem {
 
 template<int dim> class __PRegionSelector1D : public PRegionSelector1D {
 public:
-    __PRegionSelector1D() : PRegionSelector1D(dim) {}
+    __PRegionSelector1D(VAPoR::ControlExec* ce = nullptr) : PRegionSelector1D(dim, ce) {}
 };
 typedef __PRegionSelector1D<0> PRegionSelectorX;
 typedef __PRegionSelector1D<1> PRegionSelectorY;

lib/render/Renderer.cpp

@@ -26,6 +26,7 @@
 
 #include <vapor/glutil.h>    // Must be included first!!!
 #include <vapor/Renderer.h>
+#include <vapor/TwoDDataRenderer.h>
 #include <vapor/DataMgrUtils.h>
 #include "vapor/GLManager.h"
 #include "vapor/FontManager.h"
@@ -120,6 +121,11 @@ int Renderer::paintGL(bool fast)
 
     mm->MatrixModeModelView();
     mm->PushMatrix();
+
+    if (dynamic_cast<TwoDDataRenderer*>(this) != nullptr) {
+        float zOffset = GetDefaultZ(_dataMgr, GetActiveParams()->GetCurrentTimestep());
+        _glManager->matrixManager->Translate(0, 0, zOffset);
+    }
     ApplyTransform(_glManager, GetDatasetTransform(), rParams->GetTransform());
 
     int rc = _paintGL(fast);

lib/render/TwoDRenderer.cpp

@@ -82,9 +82,6 @@ int TwoDRenderer::_initializeGL()
 
 int TwoDRenderer::_paintGL(bool)
 {
-    float zOffset = GetDefaultZ(_dataMgr, GetActiveParams()->GetCurrentTimestep());
-    _glManager->matrixManager->Translate(0, 0, zOffset);
-
     // Get the 2D texture
     //
     _texture = GetTexture(_dataMgr, _texWidth, _texHeight, _texInternalFormat, _texFormat, _texType, _texelSize, _gridAligned);
@@ -105,7 +102,6 @@ int TwoDRenderer::_paintGL(bool)
 
         _texCoords = (GLfloat *)_sb_texCoords.Alloc(_meshWidth * _meshHeight * 2 * sizeof(*_texCoords));
         _computeTexCoords(_texCoords, _meshWidth, _meshHeight);
-
         _renderMeshUnAligned();
     } else {
         VAssert(_meshWidth == _texWidth);