X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuPlotterView.cxx;h=98a59d0840e1fe799482370196c48daf4a65660d;hb=42ab109aa8896b41a401e00e8595acf2bd1d3a92;hp=dae2a95197860c7b2ec26a73e48f91d9a226923b;hpb=44e4be7013ea566bd2bdefb9d48e1da0071c3d91;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuPlotterView.cxx b/bbtk/src/bbmaracasvisuPlotterView.cxx
index dae2a95..98a59d0 100644
--- a/bbtk/src/bbmaracasvisuPlotterView.cxx
+++ b/bbtk/src/bbmaracasvisuPlotterView.cxx
@@ -1,14 +1,14 @@
 #include "bbmaracasvisuPlotterView.h"
-#include "bbmaracasvisuPackage.h"
+#include "bbcreaMaracasVisuPackage.h"
 
 #include "pPlotterScaleX.h"
 #include "pPlotterScaleY.h"
 
 
-namespace bbmaracasvisu
+namespace bbcreaMaracasVisu
 {
 
-BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,PlotterView)
+BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,PlotterView)
 BBTK_BLACK_BOX_IMPLEMENTATION(PlotterView,bbtk::WxBlackBox);
 
 //---------------------------------------------------
@@ -17,34 +17,44 @@ void PlotterView::Process()
 }
 
 //---------------------------------------------------
-void PlotterView::CreateWidget()
+void PlotterView::CreateWidget(wxWindow* parent)
 {
-    bbtkDebugMessageInc("Core",9,"PlotterView::CreateWxWindow()"<<std::endl);
-		mwxwidget = new pPlotterWindow(  bbGetWxParent() , -1,wxDefaultPosition,  wxDefaultSize,  0 );
-		mwxwidget->AddLayer(new pPlotterScaleX());
-		mwxwidget->AddLayer(new pPlotterScaleY());
-		pGraphicalFunction *pGF = mwxwidget->getFunctionForVectors( &(bbGetInputInX()), &(bbGetInputInY()) );
-		mwxwidget->addFunction(pGF);
-    bbtkDebugDecTab("Core",9);
-    bbSetOutputWidget( mwxwidget );
+   bbtkDebugMessageInc("Core",9,"PlotterView::CreateWxWindow()"<<std::endl);
+    
+   mwxwidget = new pPlotterWindow( parent , -1,wxDefaultPosition,  wxDefaultSize,  0 );
+   mwxwidget->AddLayer(new pPlotterScaleX());
+   mwxwidget->AddLayer(new pPlotterScaleY());
+   
+   // avoid 'taking address of temporary '
+   //pGraphicalFunction *pGF = mwxwidget->getFunctionForVectors( &(bbGetInputInX()), &(bbGetInputInY()) ); // taking address of temporary ! JPRx
+   std::vector<double> inX = bbGetInputInX();
+   std::vector<double> inY = bbGetInputInY();
+      
+   pGraphicalFunction *pGF = mwxwidget->getFunctionForVectors( &inX, &inY ); 
+   mwxwidget->addFunction(pGF);
+   bbtkDebugDecTab("Core",9);
+   bbSetOutputWidget( mwxwidget );
 }
 
 //---------------------------------------------------
-void PlotterView::bbUserConstructor()
-{
-}
-
-//---------------------------------------------------
-void PlotterView::bbUserCopyConstructor()
-{
-}
-
-//---------------------------------------------------
-void PlotterView::bbUserDestructor()
+void PlotterView::bbUserSetDefaultValues()
 {
+	mwxwidget = NULL;
 }
+	
+	//-----------------------------------------------------------------	
+	void PlotterView::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void PlotterView::bbUserFinalizeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
 
 }
-// EO namespace bbmaracasvisu
+// EO namespace bbcreaMaracasVisu