X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuDrawAxisTree3D.cxx;h=45ec0b7d52bf1de570da9ba36a9a9a416a08b0c8;hb=9efc4d8bf8fa16e76153eb2efccc5057a79f3d29;hp=fec824099408a2b00eace62478298500b02845c7;hpb=80fb59a800a7f9ab59bfa948d9a0046313d77bbb;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
index fec8240..45ec0b7 100644
--- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
@@ -49,7 +49,13 @@ void DrawAxisTree3D::DrawOneAxis(int iGeneral,int numPoints, int iAxis)
 	vtkActor			*vtkactor		= vtkActor::New();
 
 //	polydatamapper->ScalarVisibilityOff();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	polydatamapper->SetInput(polydata);
+#else
+	polydatamapper->SetInputData(polydata);
+	polydatamapper->Update();
+#endif
 	vtkactor->SetMapper(polydatamapper);
 
 	vecVtkPolyData.push_back( polydata );
@@ -142,7 +148,6 @@ polyline->GetPointIds()->InsertNextId(i-iGeneral);
 		vtkactor->GetProperty()->SetColor( r,g,b );
 	}  // Law 2  color for each segment
 
-
 	if (bbGetInputColourLaw()==3)  // color for each point 
 	{
 		// Setup the colors array
@@ -166,7 +171,6 @@ polyline->GetPointIds()->InsertNextId(i-iGeneral);
  
 	}  // Law 3 color for each point
 
-
 	vtkactor->GetProperty()->SetLineWidth( bbGetInputLineWidth() );
 	vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() );
 
@@ -180,18 +184,24 @@ polyline->GetPointIds()->InsertNextId(i-iGeneral);
      {
 	    bbGetInputRenderer()->AddActor( vtkactor );
      }
+
 }
 
 
 void DrawAxisTree3D::Process()
 {
-	printf("EED DrawAxisTree3D::Process start \n");
 
 	int iGeneral=0;
-	int iAxis,sizeLstAxis=bbGetInputlstIndexs().size();
+	std::vector<int> lstIndexs = bbGetInputlstIndexs();
+	if ( bbGetInputlstIndexs().size()==0 )
+	{
+		lstIndexs.push_back( bbGetInputlstPointX().size() );
+	} // if
+	int iAxis,sizeLstAxis=lstIndexs.size();
     int iActor,sizeActors = vecVtkActors.size();
 	int numPoints;
 
+
 //    if (oldLstSize!=sizeLstAxis)
 //	 {
 //        oldLstSize=sizeLstAxis;
@@ -209,9 +219,10 @@ void DrawAxisTree3D::Process()
          vecVtkPolyDataMaper.clear();
          vecVtkActors.clear();
 
+
         for ( iAxis=0 ; iAxis<sizeLstAxis ; iAxis++)
         {
-            numPoints = bbGetInputlstIndexs()[iAxis];
+            numPoints = lstIndexs[iAxis];
             DrawOneAxis(iGeneral,numPoints,iAxis);
             iGeneral = iGeneral+numPoints;
 
@@ -230,6 +241,7 @@ void DrawAxisTree3D::Process()
         } // if 
 
  //   } else {// if oldLstSize
+
         for (iActor=0 ; iActor<sizeActors; iActor++)
         {
             vecVtkActors[iActor]->GetProperty()->SetOpacity( bbGetInputOpacity() );
@@ -237,8 +249,6 @@ void DrawAxisTree3D::Process()
         }
 //    } // if oldLstSize
 
-	printf("EED DrawAxisTree3D::Process end \n");
-
 }
 
 void DrawAxisTree3D::bbUserSetDefaultValues()
@@ -276,6 +286,7 @@ void DrawAxisTree3D::bbUserSetDefaultValues()
      bbSetInputOpacity(1);
      bbSetInputLineWidth(0.5);
      bbSetInputColourLaw(1);
+     bbSetInputTransform(NULL);
 
 }