X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualViewBaseContour.cpp;h=58198eef1edbc9d72a39225f21f0233a5b166916;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=79011538b27779b299a7955c9521820a5b6dad53;hpb=3e02e4bf848d2ba9fc441be077d553e49506e6b4;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
index 7901153..58198ee 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
@@ -44,25 +44,20 @@ manualViewBaseContour::manualViewBaseContour()
 	_contourVtkActor	= NULL;
 	_bboxMapper			= NULL;
 	_range				= 1;
-	_sizePointsContour	= 100;
+	_sizePointsContour	= 500;
 	_spc[0]				= 1;
 	_spc[1]				= 1;
 	_spc[2]				= 1;
-
 	_coulorEdit_r		= 1;
 	_coulorEdit_g		= 1;
 	_coulorEdit_b		= 0;
-
 	_coulorNormal_r		= 1;
 	_coulorNormal_g		= 0;
 	_coulorNormal_b		= 1;
-
 	_coulorSelection_r	= 0;
 	_coulorSelection_g	= 1;
 	_coulorSelection_b	= 0;
-
 	_widthline			= 1;
-
 }
 // ----------------------------------------------------------------------------
 manualViewBaseContour::~manualViewBaseContour()
@@ -121,7 +116,7 @@ void manualViewBaseContour :: AddCompleteContourActor(  bool ifControlPoints )
 }
 // ---------------------------------------------------------------------------
 
-void manualViewBaseContour :: RemoveCompleteContourActor()
+void manualViewBaseContour::RemoveCompleteContourActor()
 {
 	/*vtkRenderer * theRenderer =*/  _wxvtkbaseview->GetRenderer(); // JPRx ??
 	 //Removing the spline
@@ -286,8 +281,10 @@ void manualViewBaseContour::ConstructVTKObjects()
 //EED 29Mars2009	
 	//_pts->SetPoint(0,	0	, 0	, -1000 );
 	//_pts->SetPoint(1,	0	, 0	,  1000 );
-	_pts->SetPoint(0, 	-1000	, -1000	, -1000 );
-	_pts->SetPoint(1, 	1000	, 1000	, 1000  );
+
+//EED 2017-03-02
+//	_pts->SetPoint(0, 	-1000	, -1000	, -1000 );
+//	_pts->SetPoint(1, 	1000	, 1000	, 1000  );
 
 	// This is the structure for the spline
 	_splineCell = vtkCellArray::New();
@@ -313,8 +310,16 @@ void manualViewBaseContour::ConstructVTKObjects()
     _bboxMapper			=	vtkPolyDataMapper::New();
     _bboxMapper->ScalarVisibilityOff( );
 
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_bboxMapper->SetInput(_pd);
 	_bboxMapper->ImmediateModeRenderingOn();
+#else
+	_bboxMapper->SetInputData(_pd);
+#endif
+
+
 	_contourVtkActor->SetMapper(_bboxMapper);
 	_contourVtkActor->GetProperty()->BackfaceCullingOff();
 
@@ -350,9 +355,9 @@ void manualViewBaseContour::InitTextActor()
 //	_textActor->GetPositionCoordinate()->SetValue( 0.8 , 0.8 );
 
 	vtkTextProperty *tprop = _textActor->GetTextProperty();
-	tprop->SetFontSize(14);
+	tprop->SetFontSize(12);
 	tprop->SetFontFamilyToArial();
-	tprop->SetColor(0, 0, 1);
+	tprop->SetColor(1, 1, 0);
 
 
 	//	Text 2
@@ -366,9 +371,9 @@ void manualViewBaseContour::InitTextActor()
 //	_textActor2->GetPositionCoordinate()->SetValue( 0.8 , 0.8 );
 
 	vtkTextProperty *tprop2 = _textActor2->GetTextProperty();
-	tprop2->SetFontSize(14);
+	tprop2->SetFontSize(12);
 	tprop2->SetFontFamilyToArial();
-	tprop2->SetColor(0, 0, 1);
+	tprop2->SetColor(1, 1, 0);
 
 }
 
@@ -644,10 +649,11 @@ double* manualViewBaseContour::GetVectorPointsXManualContour(){
 	double pp[3];
 	int i,size = _sizePointsContour;
 	double *vx = (double*)malloc(sizeof(double)*size);
-	for (i=0;i<size;i++){
+	for (i=0;i<size;i++)
+	{
 		_pts->GetPoint(i,pp);
 		vx[i]=pp[0];
-	}
+	} // for i
 	return vx;
 }
 // ----------------------------------------------------------------------------
@@ -656,10 +662,11 @@ double* manualViewBaseContour::GetVectorPointsYManualContour()
 	double pp[3];
 	int i,size = _sizePointsContour;
 	double *vy = (double*)malloc(sizeof(double)*size);
-	for (i=0;i<size;i++){
+	for (i=0;i<size;i++)
+	{
 		_pts->GetPoint(i,pp);
 		vy[i]=pp[1];
-	}
+	} // for i
 	return vy;
 }
 // ----------------------------------------------------------------------------
@@ -668,10 +675,11 @@ double* manualViewBaseContour::GetVectorPointsZManualContour()
 	double pp[3];
 	int i,size = _sizePointsContour;
 	double *vz = (double*)malloc(sizeof(double)*size);
-	for (i=0;i<size;i++){
+	for (i=0;i<size;i++)
+	{
 		_pts->GetPoint(i,pp);
 		vz[i]=pp[2];
-	}
+	} // for i
 	return vz;
 }
 // ----------------------------------------------------------------------------
@@ -682,10 +690,11 @@ void manualViewBaseContour::Refresh() // virtual
 		RefreshContour();
 	}
 	int i,size=_lstViewPoints.size();
-	for (i=0;i<size;i++){
+	for (i=0;i<size;i++)
+	{
 		UpdateViewPoint(i);
 		_lstViewPoints[i]->UpdateColorActor();
-	}
+	} // for i
 	UpdateColorActor();
 
 	if (_show_text==true)
@@ -971,8 +980,8 @@ void manualViewBaseContour::SetShowText(bool ok)
 	_show_text = ok;
 	if (_show_text==false && _textActor!=NULL)
 	{
-		_textActor->SetInput("00");
-		_textActor2->SetInput("00");
+		_textActor->SetInput("");
+		_textActor2->SetInput("");
 	}
 }
 // ----------------------------------------------------------------------------