Attachment #168734 for bug #155974

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

and this patch




if test -z $VTKHOME
then 
   AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled)
   if test -f /usr/include/vtk-5.2/vtkPlane.h ; then
      AC_MSG_RESULT(trying /usr)
      VTKHOME="/usr"
   fi


if test ! -z $VTKHOME
then
   LOCAL_INCLUDES="-I$VTKHOME/include/vtk-5.2 $LOCAL_INCLUDES"
   LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.2 -L/usr/lib/python2.4/site-packages/vtk $LOCAL_LIBS"
   TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.2 -L/usr/lib/python2.4/site-packages/vtk/ $TRY_LINK_LIBS"
fi

dnl vtk headers

# Save cache
AC_CACHE_SAVE

])dnl

Lines 13-19 Link Here

(-)src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip (-2 / +2 lines)
13		13
14	class SALOME_Selection : QObject	14	class SALOME_Selection : QObject
15	{	15	{
16	%HeaderCode	16	%TypeHeaderCode
17	#include <SalomePyQt.h>	17	#include <SalomePyQt.h>
18	%End	18	%End
19		19
Lines 75-81 Link Here
75		75
76	class SalomePyQt	76	class SalomePyQt
77	{	77	{
78	%HeaderCode	78	%TypeHeaderCode
79	#include <SalomePyQt.h>	79	#include <SalomePyQt.h>
80	%End	80	%End
81		81

Lines 46-53 Link Here

(-)src3.2.6.old/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx (-2 / +2 lines)
46	#include "sipSalomePyQtGUIDeclSalomePyQtGUI.h"	46	#include "sipSalomePyQtGUIDeclSalomePyQtGUI.h"
47	#endif	47	#endif
48		48
49	#include <sipqtQWidget.h>	49	//#include <sipqtQWidget.h>
50	#include <sipqtQPopupMenu.h>	50	//#include <sipqtQPopupMenu.h>
51		51
52	#include <CORBA.h>	52	#include <CORBA.h>
53		53

Lines 143-149 Link Here

(-)src3.2.6.old/GUI_SRC_3.2.6/src/SVTK/SVTK_Actor.cxx (-1 / +1 lines)
143	if(int aNbOfParts = theMapIndex.Extent()){	143	if(int aNbOfParts = theMapIndex.Extent()){
144	vtkPoints *aPoints = vtkPoints::New();	144	vtkPoints *aPoints = vtkPoints::New();
145	aPoints->SetNumberOfPoints(aNbOfParts);	145	aPoints->SetNumberOfPoints(aNbOfParts);
146	for(int i = 0; i < aNbOfParts; i++){	146	for(vtkIdType i = 0; i < aNbOfParts; i++){
147	int aPartId = theMapIndex( i+1 );	147	int aPartId = theMapIndex( i+1 );
148	if(vtkFloatingPointType* aCoord = theMapActor->GetNodeCoord(aPartId)){	148	if(vtkFloatingPointType* aCoord = theMapActor->GetNodeCoord(aPartId)){
149	aPoints->SetPoint(i,aCoord);	149	aPoints->SetPoint(i,aCoord);




  vtkIdType aPntStartId = 0;
  vtkIdType aCellStartId = 0;

  for(vtkIdType aDataSetId = 0; aDataSetId < this->InputList->GetNumberOfItems(); ++aDataSetId){
    vtkDataSet* aDataSet = (vtkDataSet *)(this->GetInput(aDataSetId));
    // Do mapping of the nodes
    if(!GetSharedPointsDataSet()){
      vtkIdType aNbPnts = aDataSet->GetNumberOfPoints();


  numCells = 0;

  vtkDataSetAttributes::FieldList cellList(this->InputList->GetNumberOfItems());
  int firstCD=1;

  for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) {
    ds = (vtkDataSet *)(this->GetInput(idx));
    if (ds != NULL)  {
      if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 )  {
        continue; //no input, just skip

  output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData());

  // 2.cells
  for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) {
    ds = (vtkDataSet *)(this->GetInput(idx));
    if (ds != NULL) {
      numCells = ds->GetNumberOfCells(); 
      cd = ds->GetCellData();

Lines 240-246 Link Here

(-)src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx (-2 / +2 lines)
240	for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){	240	for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){
241	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));	241	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
242	}	242	}
243	anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);	243	anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
244	anOutput->SetPoints(anInput->GetPoints());	244	anOutput->SetPoints(anInput->GetPoints());
245	aCellLocationsArray->Delete();	245	aCellLocationsArray->Delete();
246	}	246	}
Lines 329-335 Link Here
329	for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){	329	for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){
330	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));	330	aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
331	}	331	}
332	anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);	332	anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
333	anOutput->SetPoints(anInput->GetPoints());	333	anOutput->SetPoints(anInput->GetPoints());
334	aCellLocationsArray->Delete();	334	aCellLocationsArray->Delete();
335	}	335	}

Lines 80-86 Link Here

(-)src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx (-2 / +3 lines)
80	VTKViewer_GeometryFilter	80	VTKViewer_GeometryFilter
81	::Execute()	81	::Execute()
82	{	82	{
83	vtkDataSet *input= this->GetInput();	83	vtkDataSet input= (vtkDataSet) this->GetInput();
84	vtkIdType numCells=input->GetNumberOfCells();	84	vtkIdType numCells=input->GetNumberOfCells();
85		85
86	if (numCells == 0)	86	if (numCells == 0)
Lines 134-140 Link Here
134	vtkIdType newCellId;	134	vtkIdType newCellId;
135	int faceId, *faceVerts, numFacePts;	135	int faceId, *faceVerts, numFacePts;
136	vtkFloatingPointType *x;	136	vtkFloatingPointType *x;
137	int PixelConvert[4], aNewPts[VTK_CELL_SIZE];	137	int PixelConvert[4];
		138	vtkIdType aNewPts[VTK_CELL_SIZE];
138	// ghost cell stuff	139	// ghost cell stuff
139	unsigned char updateLevel = (unsigned char)(output->GetUpdateGhostLevel());	140	unsigned char updateLevel = (unsigned char)(output->GetUpdateGhostLevel());
140	unsigned char *cellGhostLevels = 0;	141	unsigned char *cellGhostLevels = 0;

Lines 58-64 Link Here

(-)src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx (-1 / +1 lines)
58	vtkFloatingPointType center[3], *p, pt[3];	58	vtkFloatingPointType center[3], *p, pt[3];
59	vtkPointData pd, outPD;;	59	vtkPointData pd, outPD;;
60	vtkIdList ptIds, newPtIds;	60	vtkIdList ptIds, newPtIds;
61	vtkDataSet *input= this->GetInput();	61	vtkDataSet input= (vtkDataSet) this->GetInput();
62	vtkUnstructuredGrid *output = this->GetOutput();	62	vtkUnstructuredGrid *output = this->GetOutput();
63	vtkIdType tenth;	63	vtkIdType tenth;
64	vtkFloatingPointType decimal;	64	vtkFloatingPointType decimal;

Lines 43-50 Link Here

(-)src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx (-2 / +2 lines)
43	vtkPoints *inPts;	43	vtkPoints *inPts;
44	vtkPoints *newPts;	44	vtkPoints *newPts;
45	int numPts, numCells;	45	int numPts, numCells;
46	vtkPointSet *input = this->GetInput();	46	vtkPointSet input = (vtkPointSet) this->GetInput();
47	vtkPointSet *output = this->GetOutput();	47	vtkPointSet output = (vtkPointSet) this->GetOutput();
48	vtkPointData pd=input->GetPointData(), outPD=output->GetPointData();	48	vtkPointData pd=input->GetPointData(), outPD=output->GetPointData();
49	vtkCellData cd=input->GetCellData(), outCD=output->GetCellData();	49	vtkCellData cd=input->GetCellData(), outCD=output->GetCellData();
50	output->CopyStructure( input );	50	output->CopyStructure( input );

Return to bug 155974

Lines 119-126 Link Here

(-)src3.2.6.old/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx (-7 / +7 lines)
119	vtkIdType aPntStartId = 0;	119	vtkIdType aPntStartId = 0;
120	vtkIdType aCellStartId = 0;	120	vtkIdType aCellStartId = 0;
121		121
122	for(vtkIdType aDataSetId = 0; aDataSetId < this->NumberOfInputs; ++aDataSetId){	122	for(vtkIdType aDataSetId = 0; aDataSetId < this->InputList->GetNumberOfItems(); ++aDataSetId){
123	vtkDataSet* aDataSet = (vtkDataSet *)(this->Inputs[aDataSetId]);	123	vtkDataSet* aDataSet = (vtkDataSet *)(this->GetInput(aDataSetId));
124	// Do mapping of the nodes	124	// Do mapping of the nodes
125	if(!GetSharedPointsDataSet()){	125	if(!GetSharedPointsDataSet()){
126	vtkIdType aNbPnts = aDataSet->GetNumberOfPoints();	126	vtkIdType aNbPnts = aDataSet->GetNumberOfPoints();
Lines 265-275 Link Here
265		265
266	numCells = 0;	266	numCells = 0;
267		267
268	vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs);	268	vtkDataSetAttributes::FieldList cellList(this->InputList->GetNumberOfItems());
269	int firstCD=1;	269	int firstCD=1;
270		270
271	for (idx = 0; idx < this->NumberOfInputs; ++idx) {	271	for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) {
272	ds = (vtkDataSet *)(this->Inputs[idx]);	272	ds = (vtkDataSet *)(this->GetInput(idx));
273	if (ds != NULL) {	273	if (ds != NULL) {
274	if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 ) {	274	if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 ) {
275	continue; //no input, just skip	275	continue; //no input, just skip
Lines 308-315 Link Here
308	output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData());	308	output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData());
309		309
310	// 2.cells	310	// 2.cells
311	for (idx = 0; idx < this->NumberOfInputs; ++idx) {	311	for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) {
312	ds = (vtkDataSet *)(this->Inputs[idx]);	312	ds = (vtkDataSet *)(this->GetInput(idx));
313	if (ds != NULL) {	313	if (ds != NULL) {
314	numCells = ds->GetNumberOfCells();	314	numCells = ds->GetNumberOfCells();
315	cd = ds->GetCellData();	315	cd = ds->GetCellData();

Lines 76-82 Link Here

(-)src3.2.6.old/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 (-5 / +5 lines)
76	if test -z $VTKHOME	76	if test -z $VTKHOME
77	then	77	then
78	AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled)	78	AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled)
79	if test -f /usr/include/vtk/vtkPlane.h ; then	79	if test -f /usr/include/vtk-5.2/vtkPlane.h ; then
80	AC_MSG_RESULT(trying /usr)	80	AC_MSG_RESULT(trying /usr)
81	VTKHOME="/usr"	81	VTKHOME="/usr"
82	fi	82	fi
Lines 84-92 Link Here
84		84
85	if test ! -z $VTKHOME	85	if test ! -z $VTKHOME
86	then	86	then
87	LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES"	87	LOCAL_INCLUDES="-I$VTKHOME/include/vtk-5.2 $LOCAL_INCLUDES"
88	LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $LOCAL_LIBS"	88	LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.2 -L/usr/lib/python2.4/site-packages/vtk $LOCAL_LIBS"
89	TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $TRY_LINK_LIBS"	89	TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.2 -L/usr/lib/python2.4/site-packages/vtk/ $TRY_LINK_LIBS"
90	fi	90	fi
91		91
92	dnl vtk headers	92	dnl vtk headers
Lines 142-145 Link Here
142	# Save cache	142	# Save cache
143	AC_CACHE_SAVE	143	AC_CACHE_SAVE
144		144
145	])dnl	145	])dnl