#3253 creaMaracasVisu Bug New Normal - manual paint refresh

[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuPlotterView.cxx

diff --git a/bbtk/src/bbmaracasvisuPlotterView.cxx b/bbtk/src/bbmaracasvisuPlotterView.cxx
index 4eff20d1f94f428453d3e7d18950b445709b8ae1..af7cecc2c73a004e467ead2ee84393bb63bcfb83 100644 (file)
--- a/bbtk/src/bbmaracasvisuPlotterView.cxx
+++ b/bbtk/src/bbmaracasvisuPlotterView.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.
+# ------------------------------------------------------------------------ */
+
 #include "bbmaracasvisuPlotterView.h"
 #include "bbcreaMaracasVisuPackage.h"
 
@@ -17,10 +42,7 @@ void PlotterView::Process()
 //     if (firsttime==true)
 //     {
 //             firsttime=false;
-               
-       
-       printf("EED PlotterView::Process %d %d \n ", bbGetInputInY().size(),bbGetInputInY2().size());
-       
+                       
        pGraphicalFunction *pGF = mwxwidget->getFunction(0);
        pGraphicalFunction *pGF2 = mwxwidget->getFunction(1);
 
@@ -85,6 +107,7 @@ void PlotterView::Process()
                } // if bbGetInputInY
                
 //     } // if firsttime
+
        
        if (pGF!=NULL)  
        {
@@ -109,14 +132,18 @@ void PlotterView::Process()
                }               
        }// if pGF
 
-
        if (pGF2!=NULL) 
        {
                // -Erasing  points-
                int i,sizePoints                = pGF2->getSizePoints();
                for (i=0; i<sizePoints;i++)
                {
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
                        pGF2->deletePointAt(1);   //  EED here NOT 0 is 1
+#else
+                       pGF2->deletePointAt(0);   //  EED here NOT 0 is 1
+#endif
                } // for i
                // -Add Points-
                double px;
@@ -130,30 +157,23 @@ void PlotterView::Process()
                                px = i;
                        }       
                        pGF2->AddNewPoint( px, bbGetInputInY2()[i] );
-               }               
+               }  // for       
        }// if pGF
-               
        mwxwidget->UpdateAll();
-       
-       
 }
 
        
 //---------------------------------------------------
 void PlotterView::CreateWidget(wxWindow* parent)
 {
-   bbtkDebugMessageInc("Core",9,"PlotterView::CreateWxWindow()"<<std::endl);
-    
-   mwxwidget = new pPlotterWindow( parent , -1,wxDefaultPosition,  wxDefaultSize,  0 );
-   mwxwidget->AddLayer(new pPlotterScaleX());
-   mwxwidget->AddLayer(new pPlotterScaleY());
-
+       bbtkDebugMessageInc("Core",9,"PlotterView::CreateWxWindow()"<<std::endl);
+       mwxwidget = new pPlotterWindow( parent , -1,wxDefaultPosition,  wxDefaultSize,  0 );
+       mwxwidget->AddLayer(new pPlotterScaleX());
+       mwxwidget->AddLayer(new pPlotterScaleY());
        mwxwidget->setMinScrY(0);
        mwxwidget->setMaxScrY(5000);
-
-       
-          bbtkDebugDecTab("Core",9);
-   bbSetOutputWidget( mwxwidget );
+       bbtkDebugDecTab("Core",9);
+       bbSetOutputWidget( mwxwidget );
 }
 
 //---------------------------------------------------