#719 Extended Grid Box axis to make sure a label coord is present both above max coord and below min coord

ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.cpp

@@ -68,48 +68,110 @@ void RivGridBoxGenerator::setDisplayModelOffset(cvf::Vec3d offset)
 /// 
 //--------------------------------------------------------------------------------------------------
 void RivGridBoxGenerator::setGridBoxDomainCoordBoundingBox(const cvf::BoundingBox& bb)
-{
-    cvf::BoundingBox expandedBB;
 {
     double expandFactor = 0.05;
     
-        cvf::Vec3d expandedMin;
+    // Use ScalarMapperDiscreteLinear to find human readable tick mark positions for grid box sub division coordinate values
-        expandedMin.x() = bb.min().x() - bb.extent().x() * expandFactor;
+    // Expand the range for ScalarMapperDiscreteLinear until the geometry bounding box has a generated tick mark coords
-        expandedMin.y() = bb.min().y() - bb.extent().y() * expandFactor;
+    // both below minimum and above maximum bounding box coords
-        expandedMin.z() = bb.min().z() - bb.extent().z() * expandFactor;
 
-        cvf::Vec3d expandedMax;
+    cvf::Vec3d min = bb.min();
-        expandedMax.x() = bb.max().x() + bb.extent().x() * expandFactor;
+    cvf::Vec3d max = bb.max();
-        expandedMax.y() = bb.max().y() + bb.extent().y() * expandFactor;
-        expandedMax.z() = bb.max().z() + bb.extent().z() * expandFactor;
 
-        expandedBB.add(expandedMin);
-        expandedBB.add(expandedMax);
-    }
-
-    m_domainCoordsBoundingBox = expandedBB;
-
-    m_domainCoordsXValues.clear();
-    m_domainCoordsYValues.clear();
-    m_domainCoordsZValues.clear();
-
-    cvf::Vec3d min = m_domainCoordsBoundingBox.min();
-    cvf::Vec3d max = m_domainCoordsBoundingBox.max();
-
-    cvf::ScalarMapperDiscreteLinear m_linDiscreteScalarMapper;
     size_t levelCount = 6;
 
-    m_linDiscreteScalarMapper.setRange(min.x(), max.x());
+    {
-    m_linDiscreteScalarMapper.setLevelCount(levelCount, true);
+        bool majorTickValuesCoversDomainValues = false;
-    m_linDiscreteScalarMapper.majorTickValues(&m_domainCoordsXValues);
+        while (!majorTickValuesCoversDomainValues)
+        {
+            m_domainCoordsXValues.clear();
 
-    m_linDiscreteScalarMapper.setRange(min.y(), max.y());
+            cvf::ScalarMapperDiscreteLinear linDiscreteScalarMapper;
-    m_linDiscreteScalarMapper.setLevelCount(levelCount, true);
+            linDiscreteScalarMapper.setRange(min.x(), max.x());
-    m_linDiscreteScalarMapper.majorTickValues(&m_domainCoordsYValues);
+            linDiscreteScalarMapper.setLevelCount(levelCount, true);
+            linDiscreteScalarMapper.majorTickValues(&m_domainCoordsXValues);
 
-    m_linDiscreteScalarMapper.setRange(min.z(), max.z());
+            majorTickValuesCoversDomainValues = true;
-    m_linDiscreteScalarMapper.setLevelCount(levelCount, true);
+
-    m_linDiscreteScalarMapper.majorTickValues(&m_domainCoordsZValues);
+            if (m_domainCoordsXValues[1] > bb.min().x())
+            {
+                min.x() = min.x() - bb.extent().x() * expandFactor;
+                max.x() = max.x() + bb.extent().x() * expandFactor;
+                majorTickValuesCoversDomainValues = false;
+            }
+
+            if (m_domainCoordsXValues[m_domainCoordsXValues.size() - 1] < bb.max().x())
+            {
+                min.x() = min.x() - bb.extent().x() * expandFactor;
+                max.x() = max.x() + bb.extent().x() * expandFactor;
+                majorTickValuesCoversDomainValues = false;
+            }
+        }
+    }
+
+    {
+        bool majorTickValuesCoversDomainValues = false;
+        while (!majorTickValuesCoversDomainValues)
+        {
+            m_domainCoordsYValues.clear();
+
+            cvf::ScalarMapperDiscreteLinear linDiscreteScalarMapper;
+            linDiscreteScalarMapper.setRange(min.y(), max.y());
+            linDiscreteScalarMapper.setLevelCount(levelCount, true);
+            linDiscreteScalarMapper.majorTickValues(&m_domainCoordsYValues);
+
+            majorTickValuesCoversDomainValues = true;
+
+            if (m_domainCoordsYValues[1] > bb.min().y())
+            {
+                min.y() = min.y() - bb.extent().y() * expandFactor;
+                max.y() = max.y() + bb.extent().y() * expandFactor;
+                majorTickValuesCoversDomainValues = false;
+            }
+
+            if (m_domainCoordsYValues[m_domainCoordsYValues.size() - 1] < bb.max().y())
+            {
+                min.y() = min.y() - bb.extent().y() * expandFactor;
+                max.y() = max.y() + bb.extent().y() * expandFactor;
+                majorTickValuesCoversDomainValues = false;
+            }
+        }
+    }
+
+    {
+        bool majorTickValuesCoversDomainValues = false;
+        while (!majorTickValuesCoversDomainValues)
+        {
+            m_domainCoordsZValues.clear();
+
+            cvf::ScalarMapperDiscreteLinear linDiscreteScalarMapper;
+            linDiscreteScalarMapper.setRange(min.z(), max.z());
+            linDiscreteScalarMapper.setLevelCount(levelCount, true);
+            linDiscreteScalarMapper.majorTickValues(&m_domainCoordsZValues);
+
+            majorTickValuesCoversDomainValues = true;
+
+            if (m_domainCoordsZValues[1] > bb.min().z())
+            {
+                min.z() = min.z() - bb.extent().z() * expandFactor;
+                max.z() = max.z() + bb.extent().z() * expandFactor;
+                majorTickValuesCoversDomainValues = false;
+            }
+
+            if (m_domainCoordsZValues[m_domainCoordsZValues.size() - 1] < bb.max().z())
+            {
+                min.z() = min.z() - bb.extent().z() * expandFactor;
+                max.z() = max.z() + bb.extent().z() * expandFactor;
+                majorTickValuesCoversDomainValues = false;
+            }
+        }
+    }
+    
+    cvf::BoundingBox expandedBB;
+    expandedBB.add(min);
+    expandedBB.add(max);
+
+    m_domainCoordsBoundingBox = expandedBB;
 }
 
 //--------------------------------------------------------------------------------------------------