From: Eduardo DAVILA <davila@ei-ed-606.univ-lyon1.fr>
Date: Fri, 24 Jan 2020 15:24:48 +0000 (+0100)
Subject: #3350 creaMaracasVisu Bug New Normal  -  box PlotterViewer Refresh
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3df6778f4c69e71f74ded335600d4e5fbcb36a51;p=creaMaracasVisu.git

#3350 creaMaracasVisu Bug New Normal  -  box PlotterViewer Refresh
---

diff --git a/bbtk/src/bbmaracasvisuPlotterView.cxx b/bbtk/src/bbmaracasvisuPlotterView.cxx
index af7cecc..4f3f520 100644
--- a/bbtk/src/bbmaracasvisuPlotterView.cxx
+++ b/bbtk/src/bbmaracasvisuPlotterView.cxx
@@ -39,127 +39,154 @@ BBTK_BLACK_BOX_IMPLEMENTATION(PlotterView,bbtk::WxBlackBox);
 //---------------------------------------------------
 void PlotterView::Process()
 {
-//	if (firsttime==true)
-//	{
-//		firsttime=false;
 			
-	pGraphicalFunction *pGF = mwxwidget->getFunction(0);
-	pGraphicalFunction *pGF2 = mwxwidget->getFunction(1);
+	if (bbGetInputInX().size()==bbGetInputInY().size() ) {
+
+		pGraphicalFunction *pGF  = mwxwidget->getFunction(0);
+		pGraphicalFunction *pGF2 = mwxwidget->getFunction(1);
+
+
+	// EED 2020-01-22
+		if (pGF!=NULL)  
+		{ 
+			// -Erasing  points-
+			int i,sizePoints		= pGF->getSizePoints();
+			for (i=1; i<sizePoints;i++)
+			{
+	//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+	#if wxMAJOR_VERSION <= 2
+				pGF->deletePointAt(1);   //  EED here NOT 0 is 1
+	#else
+				pGF->deletePointAt(0);   //  EED here NOT 0 is 1
+	#endif
+			} // for i
+			mwxwidget->deleteFunction(pGF);  
+			pGF=NULL;  
+		}
+	// EED 2020-01-22
+		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
+			mwxwidget->deleteFunction(pGF2); 
+			pGF2=NULL; 
+		}
+
 
-	   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
 		
-			std::vector<double> inX;
-			if (bbGetInputInX().size()==0)
+			if ( (bbGetInputInY().size()!=0) && (pGF==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> inX;
+				if (bbGetInputInX().size()==0)
 				{
-					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)		)
-		{
-			// avoid 'taking address of temporary '
-			//pGraphicalFunction *pGF = mwxwidget->getFunctionForVectors( &(bbGetInputInX()), &(bbGetInputInY()) ); // taking address of temporary ! JPRx
-		
-			std::vector<double> inX2;
-			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();
+			 
+				pGF = mwxwidget->getFunctionForVectors( &inX, &inY ); 
+				mwxwidget->addFunction(pGF);		
+			} // if bbGetInputInY
+
+			if ((bbGetInputInY2().size()!=0)&& (pGF2==NULL)		)
 			{
-				int i,size=bbGetInputInY2().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)
 				{
-					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
+					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();
+				pGF2 = mwxwidget->getFunctionForVectors( &inX2, &inY2 ); 
+				mwxwidget->addFunction(pGF2);		
+			} // if bbGetInputInY
+			
 		
-//	} // if firsttime
+	/* EED 2020-01-22
 
-	
-	if (pGF!=NULL)	
-	{
-		// -Erasing  points-
-		int i,sizePoints		= pGF->getSizePoints();
-		for (i=1; i<sizePoints;i++)
+		if (pGF!=NULL)	
 		{
-			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())
+			// -Erasing  points-
+			int i,sizePoints		= pGF->getSizePoints();
+			for (i=1; i<sizePoints;i++)
 			{
-				px = bbGetInputInX()[i]; 
-			} else {
-				px = i;
-			}	
-			pGF->AddNewPoint( px, bbGetInputInY()[i] );
-		}		
-	}// 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;
-		sizePoints=bbGetInputInY2().size();
-		for (i=0; 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++)
+			{
+	//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;
+			sizePoints=bbGetInputInY2().size();
+			for (i=0; i<sizePoints;i++)
 			{
-				px = bbGetInputInX()[i]; 
-			} else {
-				px = i;
-			}	
-			pGF2->AddNewPoint( px, bbGetInputInY2()[i] );
-		}  // for	
-	}// if pGF
-	mwxwidget->UpdateAll();
+				if (i<bbGetInputInX().size())
+				{
+					px = bbGetInputInX()[i]; 
+				} else {
+					px = i;
+				}	
+				pGF2->AddNewPoint( px, bbGetInputInY2()[i] );
+			}  // for	
+		}// if pGF
+	*/
+
+		mwxwidget->UpdateAll();
+
+	} else {
+		printf("EED Warnning... PlotterView::Process()   Size of vecto X and Y is not coherent.\n");
+	} // InX.size InY.size
+
 }
 
 	
@@ -180,7 +207,6 @@ void PlotterView::CreateWidget(wxWindow* parent)
 void PlotterView::bbUserSetDefaultValues()
 {
 	mwxwidget = NULL;
-	firsttime=true;
 }
 	
 	//-----------------------------------------------------------------	
diff --git a/bbtk/src/bbmaracasvisuPlotterView.h b/bbtk/src/bbmaracasvisuPlotterView.h
index e8b66c9..c65a727 100644
--- a/bbtk/src/bbmaracasvisuPlotterView.h
+++ b/bbtk/src/bbmaracasvisuPlotterView.h
@@ -48,8 +48,6 @@ class /*BBTK_EXPORT*/ PlotterView
 
 private:
 	pPlotterWindow *mwxwidget;
-	bool firsttime;
-
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(PlotterView,bbtk::WxBlackBox);