Prechádzať zdrojové kódy

BUG: vtkLightBoxRendererManager - In SetHighlightedBoxColor, fix comparison of new color with existing one.

Jean-Christophe Fillion-Robin 14 rokov pred
rodič
commit
d4794422e9

+ 8 - 0
Libs/Visualization/VTK/Core/Testing/Cpp/vtkLightBoxRendererManagerTest1.cpp

@@ -158,6 +158,14 @@ int vtkLightBoxRendererManagerTest1(int argc, char* argv[])
     std::cerr << "line " << __LINE__ << " - Problem with SetImageData()" << std::endl;
     return EXIT_FAILURE;
     }
+  
+  double highlightedboxColor[3] = {0.0, 1.0, 0.0};
+  lightBoxRendererManager->SetHighlightedBoxColor(highlightedboxColor);
+  if (mtime != lightBoxRendererManager->GetMTime())
+    {
+    std::cerr << "line " << __LINE__ << " - Problem with SetHighlightedBoxColor()" << std::endl;
+    return EXIT_FAILURE;
+    }
 
   //----------------------------------------------------------------------------
   // Initialize

+ 3 - 3
Libs/Visualization/VTK/Core/vtkLightBoxRendererManager.cpp

@@ -210,7 +210,7 @@ vtkLightBoxRendererManager::vtkInternal::vtkInternal(vtkLightBoxRendererManager*
   this->RendererBackgroundColor[1] = 0.0;
   this->RendererBackgroundColor[2] = 0.0;
   // Default highlightedBox color: green
-  this->HighlightedBoxColor[0] = 1.0;
+  this->HighlightedBoxColor[0] = 0.0;
   this->HighlightedBoxColor[1] = 1.0;
   this->HighlightedBoxColor[2] = 0.0;
 }
@@ -622,8 +622,8 @@ void vtkLightBoxRendererManager::SetHighlightedBoxColor(double newHighlightedBox
     }
 
   if (this->Internal->HighlightedBoxColor[0] == newHighlightedBoxColor[0] &&
-      this->Internal->HighlightedBoxColor[1] == newHighlightedBoxColor[2] &&
-      this->Internal->HighlightedBoxColor[2] == newHighlightedBoxColor[3])
+      this->Internal->HighlightedBoxColor[1] == newHighlightedBoxColor[1] &&
+      this->Internal->HighlightedBoxColor[2] == newHighlightedBoxColor[2])
     {
     return;
     }