[clitk-commits-list] Clitk branch master updated. v1.2.0-616-g390aea3

[root]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Clitk".

The branch, master has been updated
       via  390aea3ee689bd8a605e07fe5a8fde85bd4124f5 (commit)
      from  b723c3573a7b923bda4a8113159870b9fadabad2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=390aea3ee689bd8a605e07fe5a8fde85bd4124f5

commit 390aea3ee689bd8a605e07fe5a8fde85bd4124f5
Author: Vivien Delmon <vivien.delmon at creatis.insa-lyon.fr>
Date:   Wed Dec 28 14:27:46 2011 +0100

    BUG Don't try to change the VF color on cancel.
    
    - Test the validity of the color returned by the QColorDialog before
      changing the VF color.

diff --git a/vv/vvOverlayPanel.cxx b/vv/vvOverlayPanel.cxx
index 68356bf..28d8939 100644
--- a/vv/vvOverlayPanel.cxx
+++ b/vv/vvOverlayPanel.cxx
@@ -250,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();
 }
 

-----------------------------------------------------------------------

Summary of changes:
 vv/vvOverlayPanel.cxx |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Clitk