Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 138586 Details for
Bug 155974
[science overlay] sci-misc/salome-* (New packages)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for VISU component
salome-visu-3.2.6.patch (text/plain), 16.45 KB, created by
François DORIN
on 2007-12-15 21:12:49 UTC
(
hide
)
Description:
patch for VISU component
Filename:
MIME Type:
Creator:
François DORIN
Created:
2007-12-15 21:12:49 UTC
Size:
16.45 KB
patch
obsolete
>Seulement dans src3.2.6: build >Seulement dans src3.2.6/VISU_SRC_3.2.6: aclocal.m4 >Seulement dans src3.2.6/VISU_SRC_3.2.6: autom4te.cache >Seulement dans src3.2.6/VISU_SRC_3.2.6: configure >Seulement dans src3.2.6/VISU_SRC_3.2.6: configure.in >Seulement dans src3.2.6/VISU_SRC_3.2.6: salome_adm >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx 2007-11-28 17:30:04.000000000 +0100 >@@ -235,8 +235,8 @@ > { > VISU::TTimerLog aTimerLog(MYDEBUG,"VISU_AppendFilter::Execute"); > vtkUnstructuredGrid *anOutput = this->GetOutput(); >- if(this->NumberOfInputs == 1){ >- anOutput->ShallowCopy(this->Inputs[0]); >+ if(this->InputList->GetNumberOfItems() == 1){ >+ anOutput->ShallowCopy(this->GetInput(0)); > return; > } > >@@ -247,8 +247,8 @@ > return; > > if(IsMergingInputs()){ >- TCellIdMerger aFunctor(this->NumberOfInputs); >- ForEachInput<TCellIdMerger>(this->Inputs, this->NumberOfInputs, aFunctor); >+ TCellIdMerger aFunctor(this->InputList->GetNumberOfItems()); >+ ForEachInput<TCellIdMerger>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor); > > vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList; > TObject2InputIdMap& anObject2InputIdMap = aFunctor.myObject2InputIdMap; >@@ -275,7 +275,7 @@ > //TObjectId anObjectId = anIter->first; > const TInputCellId& anInputCellId = anIter->second; > TInputId anInputId = anInputCellId.first; >- if(vtkDataSet *aDataSet = (vtkDataSet *)(this->Inputs[anInputId])){ >+ if(vtkDataSet *aDataSet = (vtkDataSet *)(this->GetInput(anInputId))){ > TCellId aCellId = anInputCellId.second; > aDataSet->GetCellPoints(aCellId, anIdList); > >@@ -288,8 +288,8 @@ > } > anIdList->Delete(); > }else{ >- TCellCounter aFunctor(this->NumberOfInputs); >- ForEachInput<TCellCounter>(this->Inputs, this->NumberOfInputs, aFunctor); >+ TCellCounter aFunctor(this->InputList->GetNumberOfItems()); >+ ForEachInput<TCellCounter>((vtkDataObject**)this->InputList, this->InputList->GetNumberOfItems(), aFunctor); > > vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList; > vtkIdType aNbCells = aFunctor.GetNbCells(); >@@ -309,8 +309,8 @@ > // 2.cells > vtkIdList *anIdList = vtkIdList::New(); > anIdList->Allocate(VTK_CELL_SIZE); >- for(vtkIdType anInputId = 0; anInputId < this->NumberOfInputs; anInputId++) { >- if(vtkDataSet *aDataSet = (vtkDataSet *)(this->Inputs[anInputId])){ >+ 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 >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_AppendFilter.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx 2007-11-28 17:30:04.000000000 +0100 >@@ -1307,7 +1307,7 @@ > aConnectivity->InitTraversal(); > for(int i=0; aConnectivity->GetNextCell(npts,pts); i++) > aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); >- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); >+ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); > > if(MYVTKDEBUG) aConnectivity->DebugOn(); > >@@ -1397,7 +1397,7 @@ > aConnectivity->InitTraversal(); > for(int i=0; aConnectivity->GetNextCell(npts,pts); i++) > aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); >- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); >+ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); > > if(MYVTKDEBUG) aConnectivity->DebugOn(); > >@@ -1561,7 +1561,7 @@ > aConnectivity->InitTraversal(); > for(int i=0; aConnectivity->GetNextCell(npts,pts); i++) > aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); >- theSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); >+ theSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); > > { > int aNbTuples = aNbCells; >@@ -1829,7 +1829,7 @@ > aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); > > const TVTKSource& aSource = theGaussSubMesh->GetSource(); >- aSource->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity); >+ aSource->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity); > aSource->SetPoints(aPoints.GetPointer()); > > aCellLocationsArray->Delete(); >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_Convertor_impl.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx 2007-11-28 17:30:04.000000000 +0100 >@@ -51,7 +51,7 @@ > vtkUnstructuredGridWriter* aWriter = vtkUnstructuredGridWriter::New(); > //aWriter->SetFileType(VTK_BINARY); > aWriter->SetFileName(theFileName.c_str()); >- aWriter->SetInput(theDataSet); >+ aWriter->SetInput((vtkDataObject*)theDataSet); > aWriter->Write(); > aWriter->Delete(); > } >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/CONVERTOR: VISU_ConvertorUtils.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in >--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in 2007-11-28 17:30:01.000000000 +0100 >@@ -104,7 +104,7 @@ > $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) > > LDFLAGS+= \ >- $(VTK_LIBS) -lVTKViewer -lVisuConvertor \ >+ $(VTK_LIBS) -lVTKViewer -lVisuConvertor -lvtkWidgets \ > $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ > $(GUI_LDFLAGS) \ > $(MED_LDFLAGS) >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx 2007-11-28 17:30:02.000000000 +0100 >@@ -202,7 +202,7 @@ > vtkFloatingPointType multiplier; > vtkPoints *newPts; > vtkIdList *newCellPts; >- vtkDataSet *input = this->GetInput(); >+ vtkDataSet *input = (vtkDataSet*)(this->GetInput()); > vtkPointData *pd = input->GetPointData(); > vtkCellData *cd = input->GetCellData(); > vtkUnstructuredGrid *output = this->GetOutput(); >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: SALOME_ExtractGeometry.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx 2007-11-28 17:30:01.000000000 +0100 >@@ -127,7 +127,8 @@ > VISU_CutPlanesPL > ::ClearAppendPolyData(vtkAppendPolyData *theAppendPolyData) > { >- int iEnd = theAppendPolyData->GetNumberOfInputs(); >+ //int iEnd = theAppendPolyData->GetNumberOfInputs(); >+ int iEnd = theAppendPolyData->GetUserManagedInputs(); > for(int i = iEnd-1; i >= 0; i--) > theAppendPolyData->RemoveInput(theAppendPolyData->GetInput(i)); > } >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_CutPlanesPL.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx 2007-11-28 17:30:02.000000000 +0100 >@@ -43,10 +43,10 @@ > VISU_DeformedShapePL > ::~VISU_DeformedShapePL() > { >- myWarpVector->UnRegisterAllOutputs(); >+ //myWarpVector->UnRegisterAllOutputs(); > myWarpVector->Delete(); > >- myCellDataToPointData->UnRegisterAllOutputs(); >+ //myCellDataToPointData->UnRegisterAllOutputs(); > myCellDataToPointData->Delete(); > } > >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_DeformedShapePL.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx 2007-11-28 17:30:02.000000000 +0100 >@@ -311,7 +311,7 @@ > ::GetNodeCoord(int theObjID) > { > vtkIdType anID = GetNodeVTKID(theObjID); >- vtkDataSet* aDataSet = myGeomFilter->GetInput(); >+ vtkDataSet* aDataSet = (vtkDataSet*)(myGeomFilter->GetInput()); > return aDataSet->GetPoint(anID); > } > >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_GaussPointsPL.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx 2007-11-28 17:30:02.000000000 +0100 >@@ -44,10 +44,10 @@ > VISU_IsoSurfacesPL > ::~VISU_IsoSurfacesPL() > { >- myContourFilter->UnRegisterAllOutputs(); >+ //myContourFilter->UnRegisterAllOutputs(); > myContourFilter->Delete(); > >- myCellDataToPointData->UnRegisterAllOutputs(); >+ //myCellDataToPointData->UnRegisterAllOutputs(); > myCellDataToPointData->Delete(); > } > >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_IsoSurfacesPL.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx 2007-11-28 17:30:01.000000000 +0100 >@@ -34,7 +34,7 @@ > #include <vtkLookupTable.h> > #include <vtkTextProperty.h> > #include <vtkScalarBarActor.h> >-#include <vtkIdType.h> >+//#include <vtkIdType.h> > > #include <string.h> > >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_ScalarBarCtrl.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx 2007-11-28 17:30:02.000000000 +0100 >@@ -66,7 +66,7 @@ > VISU_ScalarMapOnDeformedShapePL > ::~VISU_ScalarMapOnDeformedShapePL() > { >- myDeformVectors->UnRegisterAllOutputs(); >+ // myDeformVectors->UnRegisterAllOutputs(); > myDeformVectors->Delete(); > > myMergeFilter->UnRegisterAllOutputs(); >@@ -75,7 +75,7 @@ > myExtractorScalars->UnRegisterAllOutputs(); > myExtractorScalars->Delete(); > >- myCellDataToPointData->UnRegisterAllOutputs(); >+ //myCellDataToPointData->UnRegisterAllOutputs(); > myCellDataToPointData->Delete(); > } > >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_ScalarMapOnDeformedShapePL.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2007-11-28 17:30:01.000000000 +0100 >@@ -61,16 +61,16 @@ > } > > VISU_StreamLinesPL::~VISU_StreamLinesPL(){ >- myPointsFilter->UnRegisterAllOutputs(); >+ //myPointsFilter->UnRegisterAllOutputs(); > myPointsFilter->Delete(); > >- myCenters->UnRegisterAllOutputs(); >+ //myCenters->UnRegisterAllOutputs(); > myCenters->Delete(); > >- myGeomFilter->UnRegisterAllOutputs(); >+ //myGeomFilter->UnRegisterAllOutputs(); > myGeomFilter->Delete(); > >- myStream->UnRegisterAllOutputs(); >+ //myStream->UnRegisterAllOutputs(); > myStream->Delete(); > } > >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/PIPELINE: VISU_StreamLinesPL.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx 2007-11-28 17:30:04.000000000 +0100 >@@ -218,7 +218,7 @@ > myMapper->RemoveAllInputs(); > myMapper->Delete(); > >- myPlaneSource->UnRegisterAllOutputs(); >+ //myPlaneSource->UnRegisterAllOutputs(); > myPlaneSource->Delete(); > } > >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISUGUI: VisuGUI_ClippingDlg.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx >--- src3.2.6_orig/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx 2007-11-28 17:30:04.000000000 +0100 >@@ -119,7 +119,7 @@ > ~TPlane() { > myMapper->RemoveAllInputs(); > myMapper->Delete(); >- myPlaneSource->UnRegisterAllOutputs(); >+ // myPlaneSource->UnRegisterAllOutputs(); > myPlaneSource->Delete(); > }; > // Not implemented. >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISUGUI: VisuGUI_Plot3DDlg.cxx~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/Makefile.in src3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in >--- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/Makefile.in 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in 2007-11-28 17:30:03.000000000 +0100 >@@ -122,7 +122,7 @@ > LDFLAGS += \ > $(PYTHON_LIBS) \ > $(QT_MT_LIBS) \ >- $(VTK_LIBS) \ >+ $(VTK_LIBS) -lvtkWidgets \ > $(QWT_LIBS) \ > $(BOOST_LIBS) \ > $(KERNEL_LDFLAGS) \ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc >--- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc 2007-11-28 17:30:04.000000000 +0100 >@@ -409,7 +409,8 @@ > aTitle = aTitle.simplifyWhiteSpace(); > aTableOfReal->SetTitle(aTitle.latin1()); > >- int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetNumberOfInputs(); >+ // int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetNumberOfInputs(); >+ int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetUserManagedInputs(); > if(MYDEBUG) MESSAGE("CutPlanes_i::BuildTableOfReal iLineEnd = "<<iLineEnd); > TXCont aXCont; > TXYMapCont aXYMapCont; >@@ -461,7 +462,7 @@ > aXYMap[aDist] = aScalars->GetTuple1(i); > } > if(aFilter){ >- aFilter->UnRegisterAllOutputs(); >+ // aFilter->UnRegisterAllOutputs(); > aFilter->Delete(); > } > } >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISU_I: VISU_CutLines_i.cc~ >diff -abur src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc >--- src3.2.6_orig/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc 2007-04-24 18:41:04.000000000 +0200 >+++ src3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc 2007-11-28 17:30:04.000000000 +0100 >@@ -161,7 +161,7 @@ > > VISU::StreamLines_i::~StreamLines_i(){ > if(MYDEBUG) MESSAGE("StreamLines_i::~StreamLines_i()"); >- myAppendFilter->UnRegisterAllOutputs(); >+ //myAppendFilter->UnRegisterAllOutputs(); > myAppendFilter->Delete(); > } > >@@ -178,8 +178,9 @@ > 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)); >+ // 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(); > } >Seulement dans src3.2.6/VISU_SRC_3.2.6/src/VISU_I: VISU_StreamLines_i.cc~
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 155974
:
102571
|
102572
|
102573
|
114639
|
114650
|
114651
|
114653
|
114655
|
114657
|
114659
|
114660
|
114662
|
114664
|
120027
|
120226
|
131980
|
131981
|
131983
|
137331
|
137336
|
137338
|
137719
|
138048
|
138578
|
138580
|
138581
|
138582
|
138583
|
138584
| 138586 |
138588
|
138877
|
138896
|
138925
|
138960
|
139043
|
139045
|
139956
|
139958
|
139964
|
139965
|
139973
|
140002
|
140005
|
140007
|
140030
|
140032
|
140064
|
140066
|
140068
|
140071
|
140073
|
140086
|
140088
|
140280
|
140283
|
140301
|
140303
|
140366
|
140368
|
140373
|
140375
|
140378
|
140385
|
140386
|
140455
|
140466
|
140468
|
140472
|
140474
|
140637
|
141242
|
141243
|
141250
|
141252
|
141254
|
141256
|
141257
|
141462
|
141473
|
141474
|
141475
|
141565
|
141572
|
142892
|
142894
|
142905
|
143984
|
143986
|
144011
|
144061
|
144063
|
144084
|
144086
|
144089
|
144091
|
144093
|
144098
|
144105
|
144107
|
144117
|
144119
|
144182
|
144184
|
144185
|
144187
|
144188
|
144198
|
144223
|
144305
|
144306
|
144308
|
144310
|
144311
|
144313
|
144314
|
144316
|
144318
|
144320
|
144347
|
144348
|
144350
|
144352
|
144353
|
144354
|
144356
|
144357
|
144557
|
145883
|
145885
|
145887
|
146138
|
146414
|
147142
|
147146
|
148604
|
148606
|
148607
|
148609
|
148611
|
148613
|
148615
|
148617
|
148618
|
148619
|
150326
|
151031
|
151032
|
151034
|
151036
|
151038
|
151039
|
151040
|
151042
|
151044
|
151045
|
152339
|
152341
|
152343
|
152345
|
152347
|
152349
|
152351
|
152353
|
152355
|
152357
|
152359
|
152361
|
152363
|
152365
|
152369
|
152371
|
152979
|
153067
|
154323
|
154325
|
154327
|
154329
|
154331
|
154333
|
154335
|
158563
|
161347
|
163275
|
163841
|
163842
|
164412
|
164611
|
168552
|
168560
|
168624
|
168626
|
168724
|
168726
|
168734
|
168736
|
178432
|
178434
|
178739
|
179160
|
179161
|
179162
|
179237
|
179627
|
179628
|
183321
|
183323
|
183324
|
183325
|
183327
|
183329
|
183347
|
183348
|
189058
|
189059
|
189061
|
200799
|
200800
|
200802
|
200803
|
200805
|
200807
|
200809
|
200811
|
200812
|
200813
|
200815
|
200816
|
200818
|
200820
|
200821
|
200823
|
200825
|
204604
|
204699
|
204980
|
205339
|
223869
|
223871
|
232539
|
234261
|
253803
|
253805
|
254743
|
254751
|
254755
|
257260
|
257261
|
268839
|
268883
|
278009
|
286253
|
286255
|
286257
|
286259
|
286261
|
286263
|
286265
|
286267
|
286269
|
286271
|
286273
|
323878