remove tools (now in tests_dav)

[clitk.git] / vv / vvOverlayPanel.cxx

diff --git a/vv/vvOverlayPanel.cxx b/vv/vvOverlayPanel.cxx
index 4d2bcf246901af90bb55d2eb413646695a87a687..28d893991556a77eed1277aa8e4738989040428b 100644 (file)
--- a/vv/vvOverlayPanel.cxx
+++ b/vv/vvOverlayPanel.cxx
@@ -192,6 +192,8 @@ void vvOverlayPanel::getFusionProperty(int opacity, int thresOpacity, int colorm
     opacityHorizontalSlider->setValue(opacity);
     thresOpacityHorizontalSlider->setEnabled(1);
     thresOpacityHorizontalSlider->setValue(thresOpacity);
+    fusionOpacitySpin->setValue(opacity); 
+    fusionThresSpin->setValue(thresOpacity);
     fusionWindowSpinBox->setEnabled(1);
     fusionLevelSpinBox->setEnabled(1);
     fusionWindowSpinBox->setValue(window);
@@ -207,6 +209,8 @@ void vvOverlayPanel::getFusionProperty(int opacity, int thresOpacity, int colorm
     opacityHorizontalSlider->setValue(0);
     thresOpacityHorizontalSlider->setEnabled(0);
     thresOpacityHorizontalSlider->setValue(0);
+    fusionOpacitySpin->setValue(0); 
+    fusionThresSpin->setValue(0);
     fusionColorMapComboBox->setEnabled(0);
     fusionColorMapComboBox->setCurrentIndex(-1);
     fusionWindowSpinBox->setEnabled(0);
@@ -246,7 +250,8 @@ void vvOverlayPanel::VFColorChangeRequest()
   QColor color(vfColorButton->palette().color(QPalette::Background));
   color = QColorDialog::getColor(color, this, "Choose the new color of the vector field");
   //vfColorButton->palette().setColor(QPalette::Background, color); SR: Not working?
-  vfColorButton->setStyleSheet("* { background-color: " + color.name() + "; border: 0px }");
+  if (color.isValid())
+    vfColorButton->setStyleSheet("* { background-color: " + color.name() + "; border: 0px }");
   this->setVFProperty();
 }