BUG 1495 Refresh PlotterView

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

diff --git a/bbtk/src/bbmaracasvisuPlotterView.cxx b/bbtk/src/bbmaracasvisuPlotterView.cxx
index c6fcb8288a047ccc7a414e134c46a63a38ff8e99..4eff20d1f94f428453d3e7d18950b445709b8ae1 100644 (file)
--- a/bbtk/src/bbmaracasvisuPlotterView.cxx
+++ b/bbtk/src/bbmaracasvisuPlotterView.cxx
@@ -14,52 +14,128 @@ BBTK_BLACK_BOX_IMPLEMENTATION(PlotterView,bbtk::WxBlackBox);
 //---------------------------------------------------
 void PlotterView::Process()
 {
+//     if (firsttime==true)
+//     {
+//             firsttime=false;
+               
        
-       if (firsttime==true)
-       {
-               firsttime=false;
-               std::vector<double> inX;
+       printf("EED PlotterView::Process %d %d \n ", bbGetInputInY().size(),bbGetInputInY2().size());
+       
+       pGraphicalFunction *pGF = mwxwidget->getFunction(0);
+       pGraphicalFunction *pGF2 = mwxwidget->getFunction(1);
+
+          if ( (bbGetInputInY().size()!=0)  &&  (bbGetInputInY2().size()==0) )
+          {
+                  bbSetInputInY2( bbGetInputInY() );
+          } 
+       
+               if ( (bbGetInputInY().size()!=0) && (pGF==NULL) )               
+               {
+                       // avoid 'taking address of temporary '
+                       //pGraphicalFunction *pGF = mwxwidget->getFunctionForVectors( &(bbGetInputInX()), &(bbGetInputInY()) ); // taking address of temporary ! JPRx
                
-               // avoid 'taking address of temporary '
-               //pGraphicalFunction *pGF = mwxwidget->getFunctionForVectors( &(bbGetInputInX()), &(bbGetInputInY()) ); // taking address of temporary ! JPRx
-               if (bbGetInputInX().size()==0)
+                       std::vector<double> inX;
+                       if (bbGetInputInX().size()==0)
+                       {
+                               int i,size=bbGetInputInY().size();
+                               for(i=0;i<size;i++)
+                               {
+                                       inX.push_back((double)i);
+                               } // for
+                       } else {
+                               inX = bbGetInputInX();
+                       } // if bbGetInputInX
+                       std::vector<double> inY = bbGetInputInY();
+                
+       /*
+                       std::vector<double> inX;
+                       std::vector<double> inY;
+                       inX.push_back(0);                       inX.push_back(200);
+                       inY.push_back(0);                       inY.push_back(1);
+        */
+                       pGF = mwxwidget->getFunctionForVectors( &inX, &inY ); 
+                       mwxwidget->addFunction(pGF);            
+               } // if bbGetInputInY
+
+               if ((bbGetInputInY2().size()!=0)&& (pGF2==NULL)         )
                {
-                       int i,size=bbGetInputInY().size();
-                       for(i=0;i<size;i++)
+                       // avoid 'taking address of temporary '
+                       //pGraphicalFunction *pGF = mwxwidget->getFunctionForVectors( &(bbGetInputInX()), &(bbGetInputInY()) ); // taking address of temporary ! JPRx
+               
+                       std::vector<double> inX2;
+                       if (bbGetInputInX().size()==0)
                        {
-                               inX.push_back((double)i);
-                       }
-               } else {
-                       
-                       inX = bbGetInputInX();
-               }
-               std::vector<double> inY = bbGetInputInY();
-               pGraphicalFunction *pGF = mwxwidget->getFunctionForVectors( &inX, &inY ); 
-               mwxwidget->addFunction(pGF);            
-       }
-       
-       
+                               int i,size=bbGetInputInY2().size();
+                               for(i=0;i<size;i++)
+                               {
+                                       inX2.push_back((double)i);
+                               } // for
+                       } else {
+                               inX2 = bbGetInputInX();
+                       } // if bbGetInputInX
+                       std::vector<double> inY2 = bbGetInputInY();
+               /*
+                       std::vector<double> inX2;
+                       std::vector<double> inY2;
+                       inX2.push_back(0);                      inX2.push_back(200);
+                       inY2.push_back(0);                      inY2.push_back(1);
+                */
+                       pGF2 = mwxwidget->getFunctionForVectors( &inX2, &inY2 ); 
+                       mwxwidget->addFunction(pGF2);           
+               } // if bbGetInputInY
+               
+//     } // if firsttime
        
-       pGraphicalFunction *pGF = mwxwidget->getFunction(0);
-       int i,sizePoints = pGF->getSizePoints();
-       for (i=0; i<sizePoints;i++)
+       if (pGF!=NULL)  
        {
-               pGF->deletePointAt(i);
-       }
-       
-       double px;
-       sizePoints=bbGetInputInY().size();
-       for (i=0; i<sizePoints;i++)
+               // -Erasing  points-
+               int i,sizePoints                = pGF->getSizePoints();
+               for (i=1; i<sizePoints;i++)
+               {
+                       pGF->deletePointAt(1);  //  EED here NOT 0 is 1
+               } // for i
+               // -Add Points-
+               double px;
+               sizePoints=bbGetInputInY().size();
+               for (i=0; i<sizePoints;i++)
+               {
+                       if (i<bbGetInputInX().size())
+                       {
+                               px = bbGetInputInX()[i]; 
+                       } else {
+                               px = i;
+                       }       
+                       pGF->AddNewPoint( px, bbGetInputInY()[i] );
+               }               
+       }// if pGF
+
+
+       if (pGF2!=NULL) 
        {
-               if (i<bbGetInputInX().size())
+               // -Erasing  points-
+               int i,sizePoints                = pGF2->getSizePoints();
+               for (i=0; i<sizePoints;i++)
                {
-                       px=bbGetInputInX()[i]; 
-               } else {
-                       px=i;
-               }       
-               pGF->AddNewPoint( px, bbGetInputInY()[i] );
-               printf ("EED PlotterView::Process %f %f\n", px, bbGetInputInY()[i]);
-       }
+                       pGF2->deletePointAt(1);   //  EED here NOT 0 is 1
+               } // for i
+               // -Add Points-
+               double px;
+               sizePoints=bbGetInputInY2().size();
+               for (i=0; i<sizePoints;i++)
+               {
+                       if (i<bbGetInputInX().size())
+                       {
+                               px = bbGetInputInX()[i]; 
+                       } else {
+                               px = i;
+                       }       
+                       pGF2->AddNewPoint( px, bbGetInputInY2()[i] );
+               }               
+       }// if pGF
+               
+       mwxwidget->UpdateAll();
+       
+       
 }
 
        
@@ -71,7 +147,11 @@ void PlotterView::CreateWidget(wxWindow* parent)
    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 );
 }