From ad888f5259959f8b4c4123b4c975adb4aa9fb052 Mon Sep 17 00:00:00 2001
From: Lamar Moore <lamar.moore@stfc.ac.uk>
Date: Wed, 12 Sep 2018 09:06:56 +0100
Subject: [PATCH] A few rendering fixes #23073
---
.../InstrumentView/InstrumentActor.h | 4 +--
.../src/BankRenderingHelpers.cpp | 4 +--
.../instrumentview/src/BankTextureBuilder.cpp | 10 +++---
.../instrumentview/src/InstrumentActor.cpp | 4 +--
.../instrumentview/src/InstrumentRenderer.cpp | 35 ++++++++++++-------
5 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentActor.h b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentActor.h
index 53bc2c7e0ba..558a1db823f 100644
--- a/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentActor.h
+++ b/qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentActor.h
@@ -61,8 +61,8 @@ public:
Mantid::Kernel::V3D &maxBound) const;
/// Set a component (and all its children) visible.
void setComponentVisible(size_t componentIndex);
- /// Toggle the visibility of the child actors (if exist).
- void setChildVisibility(bool);
+ /// Set visibilit of all components.
+ void setAllComponentsVisibility(bool);
/// Check if any child is visible
bool hasChildVisible() const;
/// Get the underlying instrument
diff --git a/qt/widgets/instrumentview/src/BankRenderingHelpers.cpp b/qt/widgets/instrumentview/src/BankRenderingHelpers.cpp
index 1007caf9e78..0cb583b4829 100644
--- a/qt/widgets/instrumentview/src/BankRenderingHelpers.cpp
+++ b/qt/widgets/instrumentview/src/BankRenderingHelpers.cpp
@@ -316,7 +316,7 @@ void renderGridBankFull(const Mantid::Geometry::ComponentInfo &compInfo,
V3D((xstep * 0.5), (ystep * 0.5), (zstep * -0.5)), basePos);
break;
case GridTextureFace::Top:
- render2DTexture(corners, nZ, bank.nY,
+ render2DTexture(corners, bank.nX, nZ,
V3D((xstep * -0.5), (ystep * +0.5), (zstep * 0.5)),
V3D((xstep * 0.5), (ystep * +0.5), (zstep * 0.5)),
V3D((xstep * 0.5), (ystep * +0.5), (zstep * -0.5)),
@@ -324,7 +324,7 @@ void renderGridBankFull(const Mantid::Geometry::ComponentInfo &compInfo,
basePos);
break;
case GridTextureFace::Bottom:
- render2DTexture(corners, nZ, bank.nY,
+ render2DTexture(corners, bank.nX, nZ,
V3D((xstep * -0.5), (ystep * -0.5), (zstep * 0.5)),
V3D((xstep * 0.5), (ystep * -0.5), (zstep * 0.5)),
V3D((xstep * 0.5), (ystep * -0.5), (zstep * -0.5)),
diff --git a/qt/widgets/instrumentview/src/BankTextureBuilder.cpp b/qt/widgets/instrumentview/src/BankTextureBuilder.cpp
index 0664e352a24..5d15e340ea9 100644
--- a/qt/widgets/instrumentview/src/BankTextureBuilder.cpp
+++ b/qt/widgets/instrumentview/src/BankTextureBuilder.cpp
@@ -55,13 +55,13 @@ void addColorsToTopAndBottomTextures(
auto ti = (layerIndex * bank.nX * 3) + (i * 3);
const auto &column = compInfo.children(children[i]);
auto col = colors[column[0]];
- topText[ti] = static_cast<char>(col.red());
- topText[ti + 1] = static_cast<char>(col.green());
- topText[ti + 2] = static_cast<char>(col.blue());
- col = colors[column[bank.nY - 1]];
bottomText[ti] = static_cast<char>(col.red());
bottomText[ti + 1] = static_cast<char>(col.green());
bottomText[ti + 2] = static_cast<char>(col.blue());
+ col = colors[column[bank.nY - 1]];
+ topText[ti] = static_cast<char>(col.red());
+ topText[ti + 1] = static_cast<char>(col.green());
+ topText[ti + 2] = static_cast<char>(col.blue());
}
}
@@ -243,7 +243,7 @@ void BankTextureBuilder::buildGridBankFull(const std::vector<GLColor> &colors,
m_textSizes[4] = res;
m_textSizes[5] = res;
textures[4].resize(res.first * res.second * 3, 0);
- // Right Face
+ // Bottom Face
textures[5].resize(res.first * res.second * 3, 0);
auto li = nZ - 1;
diff --git a/qt/widgets/instrumentview/src/InstrumentActor.cpp b/qt/widgets/instrumentview/src/InstrumentActor.cpp
index c1a03c2a5ab..2331a9047dd 100644
--- a/qt/widgets/instrumentview/src/InstrumentActor.cpp
+++ b/qt/widgets/instrumentview/src/InstrumentActor.cpp
@@ -195,7 +195,7 @@ void InstrumentActor::setupPhysicalInstrumentIfExists() {
}
void InstrumentActor::setComponentVisible(size_t componentIndex) {
- setChildVisibility(false);
+ setAllComponentsVisibility(false);
const auto &compInfo = componentInfo();
auto children = compInfo.componentsInSubtree(componentIndex);
m_isCompVisible[componentIndex] = true;
@@ -205,7 +205,7 @@ void InstrumentActor::setComponentVisible(size_t componentIndex) {
resetColors();
}
-void InstrumentActor::setChildVisibility(bool on) {
+void InstrumentActor::setAllComponentsVisibility(bool on) {
std::fill(m_isCompVisible.begin(), m_isCompVisible.end(), on);
}
diff --git a/qt/widgets/instrumentview/src/InstrumentRenderer.cpp b/qt/widgets/instrumentview/src/InstrumentRenderer.cpp
index 2f6fd54b6e4..b5beca8c917 100644
--- a/qt/widgets/instrumentview/src/InstrumentRenderer.cpp
+++ b/qt/widgets/instrumentview/src/InstrumentRenderer.cpp
@@ -28,10 +28,17 @@ size_t decodePickColorRGB(unsigned char r, unsigned char g, unsigned char b) {
return index;
}
-void updateVisited(std::vector<bool> &visited,
- const std::vector<size_t> &components) {
- for (auto component : components)
- visited[component] = true;
+void updateVisited(const Mantid::Geometry::ComponentInfo &compInfo,
+ const size_t bankIndex, std::vector<bool> &visited) {
+ visited[bankIndex] = true;
+ const auto &children = compInfo.children(bankIndex);
+ for (auto child : children) {
+ const auto &subchildren = compInfo.children(child);
+ if (subchildren.size() > 0)
+ updateVisited(compInfo, child, visited);
+ else
+ visited[child] = true;
+ }
}
} // namespace
@@ -102,29 +109,33 @@ void InstrumentRenderer::draw(const std::vector<bool> &visibleComps,
continue;
if (type == ComponentType::Grid) {
- updateVisited(visited, compInfo.componentsInSubtree(i));
- if (visibleComps[i])
+ if (visibleComps[i]) {
drawGridBank(i, picking);
+ updateVisited(compInfo, i, visited);
+ }
continue;
}
if (type == ComponentType::Rectangular) {
- updateVisited(visited, compInfo.componentsInSubtree(i));
- if (visibleComps[i])
+ if (visibleComps[i]) {
drawRectangularBank(i, picking);
+ updateVisited(compInfo, i, visited);
+ }
continue;
}
if (type == ComponentType::OutlineComposite) {
- updateVisited(visited, compInfo.componentsInSubtree(i));
- if (visibleComps[i])
+ if (visibleComps[i]) {
drawTube(i, picking);
+ updateVisited(compInfo, i, visited);
+ }
continue;
}
if (type == ComponentType::Structured) {
- updateVisited(visited, compInfo.componentsInSubtree(i));
- if (visibleComps[i])
+ if (visibleComps[i]) {
drawStructuredBank(i, picking);
+ updateVisited(compInfo, i, visited);
+ }
continue;
}
--
GitLab