X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvOverlayPanel.h;h=63bad7bc633c3461ad19d39e1b3b5f51ab2342b5;hb=98eb0c23b8066792d7a77e571fb7d48c9fe02db6;hp=07ff1274629bf17eeda91b647e9ce600c7901a24;hpb=934a64f5b51382ad6bbc78d9c8734691e599cf09;p=clitk.git

diff --git a/vv/vvOverlayPanel.h b/vv/vvOverlayPanel.h
index 07ff127..63bad7b 100644
--- a/vv/vvOverlayPanel.h
+++ b/vv/vvOverlayPanel.h
@@ -1,30 +1,22 @@
-#ifndef _vvOverlayPanel_H
-#define _vvOverlayPanel_H
-
 /*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
- Program:   vv
- Language:  C++
- Author :   Pierre Seroul (pierre.seroul@gmail.com)
-
-Copyright (C) 200COLUMN_IMAGE_NAME
-Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-CREATIS-LRMN http://www.creatis.insa-lyon.fr
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3 of the License.
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-=========================================================================*/
+  It is distributed under dual licence
 
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
+#ifndef _vvOverlayPanel_H
+#define _vvOverlayPanel_H
 #include <iostream>
 #include <vector>
 
@@ -46,10 +38,10 @@ public:
     void getVFProperty(int subsampling, int scale, int log);
     void getVFName(QString name);
 
-    void getOverlayProperty(int color);
+    void getOverlayProperty(int color, int linked, double window, double level);
     void getOverlayName(QString name);
 
-    void getFusionProperty(int opacity, int colormap, double window, double level);
+    void getFusionProperty(int opacity, int thresOpacity, int colormap, double window, double level);
     void getFusionName(QString name);
 
     void getCurrentVectorInfo(int visibility, double x, double y, double z, double value);
@@ -60,12 +52,17 @@ public slots:
     void setVFProperty();
     void setOverlayProperty();
     void setFusionProperty();
+    void VFColorChangeRequest();
 
 signals:
-    void VFPropertyUpdated(int subsampling, int scale, int log);
-    void OverlayPropertyUpdated(int color);
-    void FusionPropertyUpdated(int opacity, int colormap, double window, double level);
-
+    void VFPropertyUpdated(int subsampling, int scale, int log, int width, double r, double g, double b);
+    void OverlayPropertyUpdated(int color, int linked, double window, double level);
+    void FusionPropertyUpdated(int opacity, int thresOpacity, int colormap, double window, double level);
+
+    
+private:
+    bool disableFusionSignals;
+    
 }; // end class vvOverlayPanel
 //====================================================================