#2482 creaMaracasVisu Bug New High - ColorLayer refresh missing. The MPR is not...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / pPlotter / Histogram.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.cxx
index 5e56df749aa00e14124ef295a266f22c39059870..8526658a8478c34a4e991edcecb798e204b59d73 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 /*
  This class plots image's histograms in a plotter
 */
@@ -33,12 +58,15 @@ END_EVENT_TABLE()
  // Constructor
  //----------------------
 
-       Histogram::Histogram( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag,vtkImageData* imageData):
+//EED Borrame 07Mai2009
+//Histogram::Histogram( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag,vtkImageData* imageData):
+       Histogram::Histogram( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag):
        wxPanel(parent,id,pos,size,flag)
        {
                 SetBackgroundColour(wxColour(255,255,255));
                //histogram
-               histogram= new pHistogram(imageData);
+//EED Borrame 07Mai2009
+//             histogram= new pHistogram(imageData);
                
                //plotter
                plotter=new pPlotterWindow(this, -1, wxPoint(0,0), wxSize(742,476), wxSUNKEN_BORDER );
@@ -53,8 +81,9 @@ END_EVENT_TABLE()
                
                idHistogram=-1;
                
+//EED Borrame 07Mai2009
                //drawing
-               drawHistogram();
+//             drawHistogram();
                
                
        }
@@ -65,6 +94,13 @@ END_EVENT_TABLE()
                delete plotter;
 
        }
+
+    void Histogram::Configure(vtkImageData* imageData)
+       {
+               histogram= new pHistogram(imageData);
+               drawHistogram();
+       }
+
        /*
        Draw the histogram in the plotter
        */
@@ -83,13 +119,19 @@ END_EVENT_TABLE()
                xValues=(double*)malloc(NUM_POINTS*sizeof(double));
                yValues=(double*)malloc(NUM_POINTS*sizeof(double));
                
-               unsigned short* histogramPointer=(unsigned short*)histogramImageData->GetScalarPointer(0,0,0);
+               double* histogramPointer=(double*)histogramImageData->GetScalarPointer(0,0,0);
                
-               for(int i=0; i< histogramSize; i++)
+               int i;
+               for(i=0; i< histogramSize; i++)
                {
                        xValues[i]=i;
-                       yValues[i]=log( (double) histogramPointer[i])*10;
-               }
+                       if (histogramPointer[i]==0)
+                       {
+                               yValues[i]=0;
+                       } else {
+                               yValues[i]=log(histogramPointer[i])*10;
+                       } // if histogramPointer
+               } // for i
 
                
                pGraphicalFunction* histogramFunction=plotter->getFunctionForVectors(xValues,histogramSize,yValues,histogramSize);