Attachment #138586 for bug #155974

View | Details | Raw Unified | Return to bug 155974 | Differences between

and this patch




{
  VISU::TTimerLog aTimerLog(MYDEBUG,"VISU_AppendFilter::Execute");
  vtkUnstructuredGrid *anOutput = this->GetOutput(); 
  if(this->InputList->GetNumberOfItems() == 1){
    anOutput->ShallowCopy(this->GetInput(0));
    return;
  }
  

      return;
  
    if(IsMergingInputs()){
      TCellIdMerger aFunctor(this->InputList->GetNumberOfItems());
      ForEachInput<TCellIdMerger>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor);

      vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList;
      TObject2InputIdMap& anObject2InputIdMap = aFunctor.myObject2InputIdMap;

	//TObjectId anObjectId = anIter->first;
	const TInputCellId& anInputCellId = anIter->second;
	TInputId anInputId = anInputCellId.first;
	if(vtkDataSet *aDataSet = (vtkDataSet *)(this->GetInput(anInputId))){
	  TCellId aCellId = anInputCellId.second;
	  aDataSet->GetCellPoints(aCellId, anIdList);
	  

      }
      anIdList->Delete();
    }else{
      TCellCounter aFunctor(this->InputList->GetNumberOfItems());
      ForEachInput<TCellCounter>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor);

      vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList;
      vtkIdType aNbCells = aFunctor.GetNbCells();

      // 2.cells
      vtkIdList *anIdList = vtkIdList::New(); 
      anIdList->Allocate(VTK_CELL_SIZE);
      for(vtkIdType anInputId = 0; anInputId < this->InputList->GetNumberOfItems(); anInputId++) {
	if(vtkDataSet *aDataSet = (vtkDataSet *)(this->GetInput(anInputId))){
	  vtkIdType aNbCells = aDataSet->GetNumberOfCells(); 
	  vtkCellData *aCellData = aDataSet->GetCellData();
	  // copy cell and cell data




    aConnectivity->InitTraversal();
    for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
      aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
    theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);

    if(MYVTKDEBUG) aConnectivity->DebugOn();


    aConnectivity->InitTraversal();
    for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
      aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
    theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);

    if(MYVTKDEBUG) aConnectivity->DebugOn();


    aConnectivity->InitTraversal();
    for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
      aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
    theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
    
    {
      int aNbTuples = aNbCells;

      aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
    
    const TVTKSource& aSource = theGaussSubMesh->GetSource();
    aSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
    aSource->SetPoints(aPoints.GetPointer());
    
    aCellLocationsArray->Delete();

Lines 51-57 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx (-1 / +1 lines)
51	vtkUnstructuredGridWriter* aWriter = vtkUnstructuredGridWriter::New();	51	vtkUnstructuredGridWriter* aWriter = vtkUnstructuredGridWriter::New();
52	//aWriter->SetFileType(VTK_BINARY);	52	//aWriter->SetFileType(VTK_BINARY);
53	aWriter->SetFileName(theFileName.c_str());	53	aWriter->SetFileName(theFileName.c_str());
54	aWriter->SetInput(theDataSet);	54	aWriter->SetInput((vtkDataObject*)theDataSet);
55	aWriter->Write();	55	aWriter->Write();
56	aWriter->Delete();	56	aWriter->Delete();
57	}	57	}

Lines 104-110 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in (-1 / +1 lines)
104	$(HDF5_INCLUDES) $(BOOST_CPPFLAGS)	104	$(HDF5_INCLUDES) $(BOOST_CPPFLAGS)
105		105
106	LDFLAGS+= \	106	LDFLAGS+= \
107	$(VTK_LIBS) -lVTKViewer -lVisuConvertor \	107	$(VTK_LIBS) -lVTKViewer -lVisuConvertor -lvtkWidgets \
108	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \	108	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
109	$(GUI_LDFLAGS) \	109	$(GUI_LDFLAGS) \
110	$(MED_LDFLAGS)	110	$(MED_LDFLAGS)

Lines 202-208 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx (-1 / +1 lines)
202	vtkFloatingPointType multiplier;	202	vtkFloatingPointType multiplier;
203	vtkPoints *newPts;	203	vtkPoints *newPts;
204	vtkIdList *newCellPts;	204	vtkIdList *newCellPts;
205	vtkDataSet *input = this->GetInput();	205	vtkDataSet input = (vtkDataSet)(this->GetInput());
206	vtkPointData *pd = input->GetPointData();	206	vtkPointData *pd = input->GetPointData();
207	vtkCellData *cd = input->GetCellData();	207	vtkCellData *cd = input->GetCellData();
208	vtkUnstructuredGrid *output = this->GetOutput();	208	vtkUnstructuredGrid *output = this->GetOutput();

Lines 127-133 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx (-1 / +2 lines)
127	VISU_CutPlanesPL	127	VISU_CutPlanesPL
128	::ClearAppendPolyData(vtkAppendPolyData *theAppendPolyData)	128	::ClearAppendPolyData(vtkAppendPolyData *theAppendPolyData)
129	{	129	{
130	int iEnd = theAppendPolyData->GetNumberOfInputs();	130	//int iEnd = theAppendPolyData->GetNumberOfInputs();
		131	int iEnd = theAppendPolyData->GetUserManagedInputs();
131	for(int i = iEnd-1; i >= 0; i--)	132	for(int i = iEnd-1; i >= 0; i--)
132	theAppendPolyData->RemoveInput(theAppendPolyData->GetInput(i));	133	theAppendPolyData->RemoveInput(theAppendPolyData->GetInput(i));
133	}	134	}

Lines 43-52 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx (-2 / +2 lines)
43	VISU_DeformedShapePL	43	VISU_DeformedShapePL
44	::~VISU_DeformedShapePL()	44	::~VISU_DeformedShapePL()
45	{	45	{
46	myWarpVector->UnRegisterAllOutputs();	46	//myWarpVector->UnRegisterAllOutputs();
47	myWarpVector->Delete();	47	myWarpVector->Delete();
48		48
49	myCellDataToPointData->UnRegisterAllOutputs();	49	//myCellDataToPointData->UnRegisterAllOutputs();
50	myCellDataToPointData->Delete();	50	myCellDataToPointData->Delete();
51	}	51	}
52		52

Lines 311-317 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx (-1 / +1 lines)
311	::GetNodeCoord(int theObjID)	311	::GetNodeCoord(int theObjID)
312	{	312	{
313	vtkIdType anID = GetNodeVTKID(theObjID);	313	vtkIdType anID = GetNodeVTKID(theObjID);
314	vtkDataSet* aDataSet = myGeomFilter->GetInput();	314	vtkDataSet* aDataSet = (vtkDataSet*)(myGeomFilter->GetInput());
315	return aDataSet->GetPoint(anID);	315	return aDataSet->GetPoint(anID);
316	}	316	}
317		317

Lines 44-53 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx (-2 / +2 lines)
44	VISU_IsoSurfacesPL	44	VISU_IsoSurfacesPL
45	::~VISU_IsoSurfacesPL()	45	::~VISU_IsoSurfacesPL()
46	{	46	{
47	myContourFilter->UnRegisterAllOutputs();	47	//myContourFilter->UnRegisterAllOutputs();
48	myContourFilter->Delete();	48	myContourFilter->Delete();
49		49
50	myCellDataToPointData->UnRegisterAllOutputs();	50	//myCellDataToPointData->UnRegisterAllOutputs();
51	myCellDataToPointData->Delete();	51	myCellDataToPointData->Delete();
52	}	52	}
53		53

Lines 34-40 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx (-1 / +1 lines)
34	#include <vtkLookupTable.h>	34	#include <vtkLookupTable.h>
35	#include <vtkTextProperty.h>	35	#include <vtkTextProperty.h>
36	#include <vtkScalarBarActor.h>	36	#include <vtkScalarBarActor.h>
37	#include <vtkIdType.h>	37	//#include <vtkIdType.h>
38		38
39	#include <string.h>	39	#include <string.h>
40		40

Lines 66-72 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx (-2 / +2 lines)
66	VISU_ScalarMapOnDeformedShapePL	66	VISU_ScalarMapOnDeformedShapePL
67	::~VISU_ScalarMapOnDeformedShapePL()	67	::~VISU_ScalarMapOnDeformedShapePL()
68	{	68	{
69	myDeformVectors->UnRegisterAllOutputs();	69	// myDeformVectors->UnRegisterAllOutputs();
70	myDeformVectors->Delete();	70	myDeformVectors->Delete();
71		71
72	myMergeFilter->UnRegisterAllOutputs();	72	myMergeFilter->UnRegisterAllOutputs();
Lines 75-81 Link Here
75	myExtractorScalars->UnRegisterAllOutputs();	75	myExtractorScalars->UnRegisterAllOutputs();
76	myExtractorScalars->Delete();	76	myExtractorScalars->Delete();
77		77
78	myCellDataToPointData->UnRegisterAllOutputs();	78	//myCellDataToPointData->UnRegisterAllOutputs();
79	myCellDataToPointData->Delete();	79	myCellDataToPointData->Delete();
80	}	80	}
81		81




}

VISU_StreamLinesPL::~VISU_StreamLinesPL(){
  //myPointsFilter->UnRegisterAllOutputs();
  myPointsFilter->Delete();

  //myCenters->UnRegisterAllOutputs();
  myCenters->Delete();

  //myGeomFilter->UnRegisterAllOutputs();
  myGeomFilter->Delete();

  //myStream->UnRegisterAllOutputs();
  myStream->Delete();
}


Lines 218-224 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx (-1 / +1 lines)
218	myMapper->RemoveAllInputs();	218	myMapper->RemoveAllInputs();
219	myMapper->Delete();	219	myMapper->Delete();
220		220
221	myPlaneSource->UnRegisterAllOutputs();	221	//myPlaneSource->UnRegisterAllOutputs();
222	myPlaneSource->Delete();	222	myPlaneSource->Delete();
223	}	223	}
224		224

Lines 119-125 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx (-1 / +1 lines)
119	~TPlane() {	119	~TPlane() {
120	myMapper->RemoveAllInputs();	120	myMapper->RemoveAllInputs();
121	myMapper->Delete();	121	myMapper->Delete();
122	myPlaneSource->UnRegisterAllOutputs();	122	// myPlaneSource->UnRegisterAllOutputs();
123	myPlaneSource->Delete();	123	myPlaneSource->Delete();
124	};	124	};
125	// Not implemented.	125	// Not implemented.

Lines 122-128 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/Makefile.in (-1 / +1 lines)
122	LDFLAGS += \	122	LDFLAGS += \
123	$(PYTHON_LIBS) \	123	$(PYTHON_LIBS) \
124	$(QT_MT_LIBS) \	124	$(QT_MT_LIBS) \
125	$(VTK_LIBS) \	125	$(VTK_LIBS) -lvtkWidgets \
126	$(QWT_LIBS) \	126	$(QWT_LIBS) \
127	$(BOOST_LIBS) \	127	$(BOOST_LIBS) \
128	$(KERNEL_LDFLAGS) \	128	$(KERNEL_LDFLAGS) \

Lines 409-415 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc (-2 / +3 lines)
409	aTitle = aTitle.simplifyWhiteSpace();	409	aTitle = aTitle.simplifyWhiteSpace();
410	aTableOfReal->SetTitle(aTitle.latin1());	410	aTableOfReal->SetTitle(aTitle.latin1());
411		411
412	int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetNumberOfInputs();	412	// int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetNumberOfInputs();
		413	int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetUserManagedInputs();
413	if(MYDEBUG) MESSAGE("CutPlanes_i::BuildTableOfReal iLineEnd = "<<iLineEnd);	414	if(MYDEBUG) MESSAGE("CutPlanes_i::BuildTableOfReal iLineEnd = "<<iLineEnd);
414	TXCont aXCont;	415	TXCont aXCont;
415	TXYMapCont aXYMapCont;	416	TXYMapCont aXYMapCont;
Lines 461-467 Link Here
461	aXYMap[aDist] = aScalars->GetTuple1(i);	462	aXYMap[aDist] = aScalars->GetTuple1(i);
462	}	463	}
463	if(aFilter){	464	if(aFilter){
464	aFilter->UnRegisterAllOutputs();	465	// aFilter->UnRegisterAllOutputs();
465	aFilter->Delete();	466	aFilter->Delete();
466	}	467	}
467	}	468	}





VISU::StreamLines_i::~StreamLines_i(){
  if(MYDEBUG) MESSAGE("StreamLines_i::~StreamLines_i()");
  //myAppendFilter->UnRegisterAllOutputs();
  myAppendFilter->Delete();
}


  vtkPointSet* aSource = NULL;
  if(!thePrs3d->_is_nil())
    if((aPrs3di = dynamic_cast<VISU::Prs3d_i*>(VISU::GetServant(thePrs3d).in()))){
      //      for(int i = myAppendFilter->GetNumberOfInputs()-1; i >= 0; i--)
      //	myAppendFilter->RemoveInput(myAppendFilter->GetInput(i));
      myAppendFilter->RemoveAllInputs();
      myAppendFilter->AddInput(aPrs3di->GetPL()->GetMapper()->GetInput());
      aSource = myAppendFilter->GetOutput();
    }

Return to bug 155974

Lines 235-242 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx (-9 / +9 lines)
235	{	235	{
236	VISU::TTimerLog aTimerLog(MYDEBUG,"VISU_AppendFilter::Execute");	236	VISU::TTimerLog aTimerLog(MYDEBUG,"VISU_AppendFilter::Execute");
237	vtkUnstructuredGrid *anOutput = this->GetOutput();	237	vtkUnstructuredGrid *anOutput = this->GetOutput();
238	if(this->NumberOfInputs == 1){	238	if(this->InputList->GetNumberOfItems() == 1){
239	anOutput->ShallowCopy(this->Inputs[0]);	239	anOutput->ShallowCopy(this->GetInput(0));
240	return;	240	return;
241	}	241	}
242		242
Lines 247-254 Link Here
247	return;	247	return;
248		248
249	if(IsMergingInputs()){	249	if(IsMergingInputs()){
250	TCellIdMerger aFunctor(this->NumberOfInputs);	250	TCellIdMerger aFunctor(this->InputList->GetNumberOfItems());
251	ForEachInput<TCellIdMerger>(this->Inputs, this->NumberOfInputs, aFunctor);	251	ForEachInput<TCellIdMerger>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor);
252		252
253	vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList;	253	vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList;
254	TObject2InputIdMap& anObject2InputIdMap = aFunctor.myObject2InputIdMap;	254	TObject2InputIdMap& anObject2InputIdMap = aFunctor.myObject2InputIdMap;
Lines 275-281 Link Here
275	//TObjectId anObjectId = anIter->first;	275	//TObjectId anObjectId = anIter->first;
276	const TInputCellId& anInputCellId = anIter->second;	276	const TInputCellId& anInputCellId = anIter->second;
277	TInputId anInputId = anInputCellId.first;	277	TInputId anInputId = anInputCellId.first;
278	if(vtkDataSet aDataSet = (vtkDataSet )(this->Inputs[anInputId])){	278	if(vtkDataSet aDataSet = (vtkDataSet )(this->GetInput(anInputId))){
279	TCellId aCellId = anInputCellId.second;	279	TCellId aCellId = anInputCellId.second;
280	aDataSet->GetCellPoints(aCellId, anIdList);	280	aDataSet->GetCellPoints(aCellId, anIdList);
281		281
Lines 288-295 Link Here
288	}	288	}
289	anIdList->Delete();	289	anIdList->Delete();
290	}else{	290	}else{
291	TCellCounter aFunctor(this->NumberOfInputs);	291	TCellCounter aFunctor(this->InputList->GetNumberOfItems());
292	ForEachInput<TCellCounter>(this->Inputs, this->NumberOfInputs, aFunctor);	292	ForEachInput<TCellCounter>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor);
293		293
294	vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList;	294	vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList;
295	vtkIdType aNbCells = aFunctor.GetNbCells();	295	vtkIdType aNbCells = aFunctor.GetNbCells();
Lines 309-316 Link Here
309	// 2.cells	309	// 2.cells
310	vtkIdList *anIdList = vtkIdList::New();	310	vtkIdList *anIdList = vtkIdList::New();
311	anIdList->Allocate(VTK_CELL_SIZE);	311	anIdList->Allocate(VTK_CELL_SIZE);
312	for(vtkIdType anInputId = 0; anInputId < this->NumberOfInputs; anInputId++) {	312	for(vtkIdType anInputId = 0; anInputId < this->InputList->GetNumberOfItems(); anInputId++) {
313	if(vtkDataSet aDataSet = (vtkDataSet )(this->Inputs[anInputId])){	313	if(vtkDataSet aDataSet = (vtkDataSet )(this->GetInput(anInputId))){
314	vtkIdType aNbCells = aDataSet->GetNumberOfCells();	314	vtkIdType aNbCells = aDataSet->GetNumberOfCells();
315	vtkCellData *aCellData = aDataSet->GetCellData();	315	vtkCellData *aCellData = aDataSet->GetCellData();
316	// copy cell and cell data	316	// copy cell and cell data

Lines 161-167 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc (-3 / +4 lines)
161		161
162	VISU::StreamLines_i::~StreamLines_i(){	162	VISU::StreamLines_i::~StreamLines_i(){
163	if(MYDEBUG) MESSAGE("StreamLines_i::~StreamLines_i()");	163	if(MYDEBUG) MESSAGE("StreamLines_i::~StreamLines_i()");
164	myAppendFilter->UnRegisterAllOutputs();	164	//myAppendFilter->UnRegisterAllOutputs();
165	myAppendFilter->Delete();	165	myAppendFilter->Delete();
166	}	166	}
167		167
Lines 178-185 Link Here
178	vtkPointSet* aSource = NULL;	178	vtkPointSet* aSource = NULL;
179	if(!thePrs3d->_is_nil())	179	if(!thePrs3d->_is_nil())
180	if((aPrs3di = dynamic_cast<VISU::Prs3d_i*>(VISU::GetServant(thePrs3d).in()))){	180	if((aPrs3di = dynamic_cast<VISU::Prs3d_i*>(VISU::GetServant(thePrs3d).in()))){
181	for(int i = myAppendFilter->GetNumberOfInputs()-1; i >= 0; i--)	181	// for(int i = myAppendFilter->GetNumberOfInputs()-1; i >= 0; i--)
182	myAppendFilter->RemoveInput(myAppendFilter->GetInput(i));	182	// myAppendFilter->RemoveInput(myAppendFilter->GetInput(i));
		183	myAppendFilter->RemoveAllInputs();
183	myAppendFilter->AddInput(aPrs3di->GetPL()->GetMapper()->GetInput());	184	myAppendFilter->AddInput(aPrs3di->GetPL()->GetMapper()->GetInput());
184	aSource = myAppendFilter->GetOutput();	185	aSource = myAppendFilter->GetOutput();
185	}	186	}

Lines 1307-1313 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx (-4 / +4 lines)
1307	aConnectivity->InitTraversal();	1307	aConnectivity->InitTraversal();
1308	for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)	1308	for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
1309	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));	1309	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
1310	theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);	1310	theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
1311		1311
1312	if(MYVTKDEBUG) aConnectivity->DebugOn();	1312	if(MYVTKDEBUG) aConnectivity->DebugOn();
1313		1313
Lines 1397-1403 Link Here
1397	aConnectivity->InitTraversal();	1397	aConnectivity->InitTraversal();
1398	for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)	1398	for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
1399	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));	1399	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
1400	theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);	1400	theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
1401		1401
1402	if(MYVTKDEBUG) aConnectivity->DebugOn();	1402	if(MYVTKDEBUG) aConnectivity->DebugOn();
1403		1403
Lines 1561-1567 Link Here
1561	aConnectivity->InitTraversal();	1561	aConnectivity->InitTraversal();
1562	for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)	1562	for(int i=0; aConnectivity->GetNextCell(npts,pts); i++)
1563	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));	1563	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
1564	theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);	1564	theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
1565		1565
1566	{	1566	{
1567	int aNbTuples = aNbCells;	1567	int aNbTuples = aNbCells;
Lines 1829-1835 Link Here
1829	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));	1829	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
1830		1830
1831	const TVTKSource& aSource = theGaussSubMesh->GetSource();	1831	const TVTKSource& aSource = theGaussSubMesh->GetSource();
1832	aSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);	1832	aSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
1833	aSource->SetPoints(aPoints.GetPointer());	1833	aSource->SetPoints(aPoints.GetPointer());
1834		1834
1835	aCellLocationsArray->Delete();	1835	aCellLocationsArray->Delete();

Lines 61-76 Link Here

(-)src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx (-4 / +4 lines)
61	}	61	}
62		62
63	VISU_StreamLinesPL::~VISU_StreamLinesPL(){	63	VISU_StreamLinesPL::~VISU_StreamLinesPL(){
64	myPointsFilter->UnRegisterAllOutputs();	64	//myPointsFilter->UnRegisterAllOutputs();
65	myPointsFilter->Delete();	65	myPointsFilter->Delete();
66		66
67	myCenters->UnRegisterAllOutputs();	67	//myCenters->UnRegisterAllOutputs();
68	myCenters->Delete();	68	myCenters->Delete();
69		69
70	myGeomFilter->UnRegisterAllOutputs();	70	//myGeomFilter->UnRegisterAllOutputs();
71	myGeomFilter->Delete();	71	myGeomFilter->Delete();
72		72
73	myStream->UnRegisterAllOutputs();	73	//myStream->UnRegisterAllOutputs();
74	myStream->Delete();	74	myStream->Delete();
75	}	75	}
76		76