Attachment #138583 for bug #155974

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

and this patch




  myPtsLabeledDataMapper->RemoveAllInputs();
  myPtsLabeledDataMapper->Delete();

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

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

  myPointLabels->Delete();

  myClsLabeledDataMapper->RemoveAllInputs();
  myClsLabeledDataMapper->Delete();

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

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

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

  myCellsLabels->Delete();




      for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
	aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
      
      aDataSet->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity );
      SetUnstructuredGrid(aDataSet);

      aDataSet->GetCellData()->SetScalars(aScalars);

      for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
	aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
      
      aDataSet->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity );
      SetUnstructuredGrid(aDataSet);

      aDataSet->GetCellData()->SetScalars(aScalars);

    for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
      aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
    
    aDataSet->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity );

    SetUnstructuredGrid(aDataSet);
    aDataSet->Delete();

Lines 84-90 Link Here

(-)src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_ExtractGeometry.cxx (-1 / +1 lines)
84	vtkFloatingPointType multiplier;	84	vtkFloatingPointType multiplier;
85	vtkPoints *newPts;	85	vtkPoints *newPts;
86	vtkIdList *newCellPts;	86	vtkIdList *newCellPts;
87	vtkDataSet *input = this->GetInput();	87	vtkDataSet input = (vtkDataSet) this->GetInput();
88	vtkPointData *pd = input->GetPointData();	88	vtkPointData *pd = input->GetPointData();
89	vtkCellData *cd = input->GetCellData();	89	vtkCellData *cd = input->GetCellData();
90	vtkUnstructuredGrid *output = this->GetOutput();	90	vtkUnstructuredGrid *output = this->GetOutput();

Lines 436-442 Link Here

(-)src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Object.cxx (-1 / +1 lines)
436	for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )	436	for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
437	aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );	437	aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
438		438
439	myGrid->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );	439	myGrid->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity );
440		440
441	aCellLocationsArray->Delete();	441	aCellLocationsArray->Delete();
442	aCellTypesArray->Delete();	442	aCellTypesArray->Delete();

Lines 182-188 Link Here

(-)src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx (-1 / +1 lines)
182	myMapper->RemoveAllInputs();	182	myMapper->RemoveAllInputs();
183	myMapper->Delete();	183	myMapper->Delete();
184		184
185	myPlaneSource->UnRegisterAllOutputs();	185	//myPlaneSource->UnRegisterAllOutputs();
186	myPlaneSource->Delete();	186	myPlaneSource->Delete();
187	};	187	};
188		188

Lines 261-270 Link Here

(-)src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx (-2 / +2 lines)
261	myPtsLabeledDataMapper->RemoveAllInputs();	261	myPtsLabeledDataMapper->RemoveAllInputs();
262	myPtsLabeledDataMapper->Delete();	262	myPtsLabeledDataMapper->Delete();
263		263
264	myPtsSelectVisiblePoints->UnRegisterAllOutputs();	264	//myPtsSelectVisiblePoints->UnRegisterAllOutputs();
265	myPtsSelectVisiblePoints->Delete();	265	myPtsSelectVisiblePoints->Delete();
266		266
267	myPtsMaskPoints->UnRegisterAllOutputs();	267	//myPtsMaskPoints->UnRegisterAllOutputs();
268	myPtsMaskPoints->Delete();	268	myPtsMaskPoints->Delete();
269		269
270	myPointLabels->Delete();	270	myPointLabels->Delete();

Lines 210-216 Link Here

(-)src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx (-1 / +1 lines)
210	for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )	210	for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
211	aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );	211	aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
212		212
213	myGrid->SetCells( aCellTypesArray, aCellLocationsArray, aConnectivity );	213	myGrid->SetCells( aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray, aConnectivity );
214		214
215	myPreviewActor->GetMapper()->Update();	215	myPreviewActor->GetMapper()->Update();
216		216

Lines 1242-1248 Link Here

(-)src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx (-1 / +1 lines)
1242	aCellLocationsArray->SetValue(idType, aConnectivity->GetTraversalLocation(npts));	1242	aCellLocationsArray->SetValue(idType, aConnectivity->GetTraversalLocation(npts));
1243		1243
1244	aGrid->SetPoints(aPoints);	1244	aGrid->SetPoints(aPoints);
1245	aGrid->SetCells(aCellTypesArray, aCellLocationsArray,aConnectivity);	1245	aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
1246		1246
1247	aConnectivity->Delete();	1247	aConnectivity->Delete();
1248	aPoints->Delete();	1248	aPoints->Delete();

Lines 564-570 Link Here

(-)src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx (-1 / +1 lines)
564	aGrid->SetPoints(aPoints);	564	aGrid->SetPoints(aPoints);
565	aPoints->Delete();	565	aPoints->Delete();
566		566
567	aGrid->SetCells(aCellTypesArray,aCellLocationsArray,aCells);	567	aGrid->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aCells);
568	aCellLocationsArray->Delete();	568	aCellLocationsArray->Delete();
569	aCellTypesArray->Delete();	569	aCellTypesArray->Delete();
570	aCells->Delete();	570	aCells->Delete();

Lines 1346-1352 Link Here

(-)src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx (-1 / +1 lines)
1346	aCellLocationsArray->SetValue(idType, aConnectivity->GetTraversalLocation(npts));	1346	aCellLocationsArray->SetValue(idType, aConnectivity->GetTraversalLocation(npts));
1347		1347
1348	aGrid->SetPoints(aPoints);	1348	aGrid->SetPoints(aPoints);
1349	aGrid->SetCells(aCellTypesArray, aCellLocationsArray,aConnectivity);	1349	aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
1350		1350
1351	// Create and display actor	1351	// Create and display actor
1352	vtkDataSetMapper* aMapper = vtkDataSetMapper::New();	1352	vtkDataSetMapper* aMapper = vtkDataSetMapper::New();

Lines 158-167 Link Here

(-)src3.2.6_orig/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_NodesDlg.cxx (-2 / +2 lines)
158	vtkIdType npts;	158	vtkIdType npts;
159	aCellLocationsArray->SetValue(0, aCells->GetTraversalLocation(npts));	159	aCellLocationsArray->SetValue(0, aCells->GetTraversalLocation(npts));
160		160
161	aGrid->SetCells(aCellTypesArray, aCellLocationsArray, aCells);	161	aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray, aCells);
162		162
163	aGrid->SetPoints(myPoints);	163	aGrid->SetPoints(myPoints);
164	aGrid->SetCells(aCellTypesArray, aCellLocationsArray,aCells);	164	aGrid->SetCells(aCellTypesArray, (vtkIdTypeArray*)aCellLocationsArray,aCells);
165	aCellLocationsArray->Delete();	165	aCellLocationsArray->Delete();
166	aCellTypesArray->Delete();	166	aCellTypesArray->Delete();
167	aCells->Delete();	167	aCells->Delete();

Return to bug 155974

Lines 409-418 Link Here

(-)src3.2.6_orig/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Actor.cxx (-5 / +5 lines)
409	myPtsLabeledDataMapper->RemoveAllInputs();	409	myPtsLabeledDataMapper->RemoveAllInputs();
410	myPtsLabeledDataMapper->Delete();	410	myPtsLabeledDataMapper->Delete();
411		411
412	myPtsSelectVisiblePoints->UnRegisterAllOutputs();	412	//myPtsSelectVisiblePoints->UnRegisterAllOutputs();
413	myPtsSelectVisiblePoints->Delete();	413	myPtsSelectVisiblePoints->Delete();
414		414
415	myPtsMaskPoints->UnRegisterAllOutputs();	415	//myPtsMaskPoints->UnRegisterAllOutputs();
416	myPtsMaskPoints->Delete();	416	myPtsMaskPoints->Delete();
417		417
418	myPointLabels->Delete();	418	myPointLabels->Delete();
Lines 425-437 Link Here
425	myClsLabeledDataMapper->RemoveAllInputs();	425	myClsLabeledDataMapper->RemoveAllInputs();
426	myClsLabeledDataMapper->Delete();	426	myClsLabeledDataMapper->Delete();
427		427
428	myClsSelectVisiblePoints->UnRegisterAllOutputs();	428	//myClsSelectVisiblePoints->UnRegisterAllOutputs();
429	myClsSelectVisiblePoints->Delete();	429	myClsSelectVisiblePoints->Delete();
430		430
431	myClsMaskPoints->UnRegisterAllOutputs();	431	//myClsMaskPoints->UnRegisterAllOutputs();
432	myClsMaskPoints->Delete();	432	myClsMaskPoints->Delete();
433		433
434	myCellCenters->UnRegisterAllOutputs();	434	//myCellCenters->UnRegisterAllOutputs();
435	myCellCenters->Delete();	435	myCellCenters->Delete();
436		436
437	myCellsLabels->Delete();	437	myCellsLabels->Delete();