X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkAppendPolyData.xml;h=f415a88ad4a8650f03402401e999cfd175432028;hb=edb8e9b8948e7216e06b3ef5228b16f18417ca52;hp=a422ab5579b8a26d9e8d3130c311c8098025efcd;hpb=32f28c419e0c356a18a288af2ea6ffdd32a259ca;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkAppendPolyData.xml b/packages/vtk/src/bbvtkAppendPolyData.xml
index a422ab5..f415a88 100644
--- a/packages/vtk/src/bbvtkAppendPolyData.xml
+++ b/packages/vtk/src/bbvtkAppendPolyData.xml
@@ -8,7 +8,7 @@
 <category>mesh</category>
 
 <include>vtkAppendPolyData.h</include> 
-<vtkparent>vtkAppendPolyData</vtkparent>
+<vtkobject>vtkAppendPolyData</vtkobject>
 
 <output name="Out" type="vtkPolyData*" special="vtk output" description="Output Mesh"/>
 <input name="In1" type="vtkPolyData *" description="PolyData 1"/>
@@ -16,20 +16,44 @@
 <input name="In3" type="vtkPolyData *" description="PolyData 3"/>
 <input name="In4" type="vtkPolyData *" description="PolyData 4"/>
 <input name="In5" type="vtkPolyData *" description="PolyData 5"/>
+<typedef><PRE>typedef std::vector<vtkPolyData *> InputVector;</PRE></typedef>
+<input name="InVector" type="InputVector" description="PolyData vector"/>
 
 <process>
 <PRE>
-  SetInput(bbGetInputIn1());
-  SetInput(bbGetInputIn2());
-  SetInput(bbGetInputIn3());
-  SetInput(bbGetInputIn4());
-  SetInput(bbGetInputIn5());
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+  bbGetVtkObject()->SetInput(bbGetInputIn1());
+  bbGetVtkObject()->SetInput(bbGetInputIn2());
+  bbGetVtkObject()->SetInput(bbGetInputIn3());
+  bbGetVtkObject()->SetInput(bbGetInputIn4());
+  bbGetVtkObject()->SetInput(bbGetInputIn5());
+  if(!bbGetInputInVector().empty()){
+	for(int i = 0; i < (int) bbGetInputInVector().size(); i++){
+		bbGetVtkObject()->SetInput(bbGetInputInVector()[i]);
+	}
+  }
+#else
+  bbGetVtkObject()->AddInputData(bbGetInputIn1());
+  bbGetVtkObject()->AddInputData(bbGetInputIn2());
+  bbGetVtkObject()->AddInputData(bbGetInputIn3());
+  bbGetVtkObject()->AddInputData(bbGetInputIn4());
+  bbGetVtkObject()->AddInputData(bbGetInputIn5());
+  if(!bbGetInputInVector().empty()){
+	for(int i = 0; i < (int) bbGetInputInVector().size(); i++){
+		bbGetVtkObject()->AddInputData(bbGetInputInVector()[i]);
+	}
+  }
+#endif
+
    
-  Update();
+  bbGetVtkObject()->Update();
 </PRE>
 </process>
 
-<constructor>
+<defaultValues>
 <PRE>
   bbSetInputIn1((vtkPolyData *)0);
   bbSetInputIn2((vtkPolyData *)0);
@@ -38,7 +62,7 @@
   bbSetInputIn5((vtkPolyData *)0);
   bbSetOutputOut((vtkPolyData *)0);
 </PRE>
-</constructor>   
+</defaultValues>   
 
 
 </blackbox>