Attachment #131983 for bug #155974

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

and this patch

Lines 28-34 Link Here

(-)GUI_SRC_3.2.6/doc/salome/gui/Makefile.in.org (-1 / +1 lines)
28	@COMMENCE@	28	@COMMENCE@
29		29
30	usr_docs:	30	usr_docs:
31	cp -fr $(srcdir)/GUI ./	31	# cp -fr $(srcdir)/GUI ./
32	-find $(PWD) -name CVS -prune -exec rm -rf {} \;	32	-find $(PWD) -name CVS -prune -exec rm -rf {} \;
33		33
34	docs: usr_docs	34	docs: usr_docs




all: resources

install:
#	cp -rf @top_srcdir@/adm_local @prefix@

bin:

resources :
#	cp -rf @top_srcdir@/adm_local $(top_builddir)

inc:


Lines 109-115 Link Here

(-)GUI_SRC_3.2.6/build_configure.org (-1 / +1 lines)
109		109
110	# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files	110	# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
111	echo "" >> configure.in_tmp1	111	echo "" >> configure.in_tmp1
112	echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1	112	echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
113		113
114	echo "" >> configure.in_tmp1	114	echo "" >> configure.in_tmp1
115	echo "AC_OUTPUT([ \\" >> configure.in_tmp1	115	echo "AC_OUTPUT([ \\" >> configure.in_tmp1




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


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

dnl vtk headers

# Save cache
AC_CACHE_SAVE

])dnl

Lines 36-41 Link Here

(-)GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in.org (+12 lines)
36	QT_VERS = Qt_3_3_0	36	QT_VERS = Qt_3_3_0
37	endif	37	endif
38		38
		39	ifeq ($(QT_VERS),Qt_3_3_5)
		40	QT_VERS = Qt_3_3_0
		41	endif
		42
39	ifeq ($(QT_VERS),Qt_3_3_6)	43	ifeq ($(QT_VERS),Qt_3_3_6)
40	QT_VERS = Qt_3_3_0	44	QT_VERS = Qt_3_3_0
41	endif	45	endif
Lines 44-49 Link Here
44	QT_VERS = Qt_3_3_0	48	QT_VERS = Qt_3_3_0
45	endif	49	endif
46		50
		51	ifeq ($(QT_VERS),Qt_3_3_8)
		52	QT_VERS = Qt_3_3_0
		53	endif
		54
		55	ifeq ($(QT_VERS),Qt_3_3_9)
		56	QT_VERS = Qt_3_3_0
		57	endif
		58
47	# Sip flags	59	# Sip flags
48	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)	60	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
49		61

Lines 35-46 Link Here

(-)GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in.org (+9 lines)
35	ifeq ($(QT_VERS),Qt_3_3_4)	35	ifeq ($(QT_VERS),Qt_3_3_4)
36	QT_VERS = Qt_3_3_0	36	QT_VERS = Qt_3_3_0
37	endif	37	endif
		38	ifeq ($(QT_VERS),Qt_3_3_5)
		39	QT_VERS = Qt_3_3_0
		40	endif
38	ifeq ($(QT_VERS),Qt_3_3_6)	41	ifeq ($(QT_VERS),Qt_3_3_6)
39	QT_VERS = Qt_3_3_0	42	QT_VERS = Qt_3_3_0
40	endif	43	endif
41	ifeq ($(QT_VERS),Qt_3_3_7)	44	ifeq ($(QT_VERS),Qt_3_3_7)
42	QT_VERS = Qt_3_3_0	45	QT_VERS = Qt_3_3_0
43	endif	46	endif
		47	ifeq ($(QT_VERS),Qt_3_3_8)
		48	QT_VERS = Qt_3_3_0
		49	endif
		50	ifeq ($(QT_VERS),Qt_3_3_9)
		51	QT_VERS = Qt_3_3_0
		52	endif
44		53
45	# Sip flags	54	# Sip flags
46	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)	55	SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)




#include <vtkCellData.h>
#include <vtkDataSetAttributes.h>
#include <vtkDataSetCollection.h>
#include <vtkExecutive.h>
#include <vtkObjectFactory.h>
#include <vtkPointData.h>
#include <vtkUnstructuredGrid.h>

  vtkIdType aPntStartId = 0;
  vtkIdType aCellStartId = 0;

  for(vtkIdType aDataSetId = 0; aDataSetId < this->GetNumberOfInputConnections(0); ++aDataSetId){
    vtkDataSet* aDataSet = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,aDataSetId));

    // Do mapping of the nodes
    if(!GetSharedPointsDataSet()){
      vtkIdType aNbPnts = aDataSet->GetNumberOfPoints();


  numCells = 0;

  vtkDataSetAttributes::FieldList cellList(this->GetNumberOfInputConnections(0));
  int firstCD=1;

  for (idx = 0; idx < this->GetNumberOfInputConnections(0); ++idx) {
    ds = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,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->GetNumberOfInputConnections(0); ++idx) {
    ds = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,idx));
    if (ds != NULL) {
      numCells = ds->GetNumberOfCells(); 
      cd = ds->GetCellData();

Lines 22-28 Link Here

(-)GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_CellLocationsArray.h.org (-1 / +1 lines)
22		22
23	#include "VTKViewer.h"	23	#include "VTKViewer.h"
24		24
25	#if (VTK_MAJOR_VERSION >= 4) && (VTK_MINOR_VERSION >= 4)	25	#if ((VTK_MAJOR_VERSION == 5) \|\| ((VTK_MAJOR_VERSION==4) && (VTK_MINOR_VERSION>=4) ))
26	# include <vtkIdTypeArray.h>	26	# include <vtkIdTypeArray.h>
27	# define TCellLocationsArray vtkIdTypeArray	27	# define TCellLocationsArray vtkIdTypeArray
28	#else	28	#else

Return to bug 155974

Lines 76-82 Link Here

(-)GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4.org (-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.0/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.0 $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.0 -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.0 -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

Lines 32-37 Link Here

(-)GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx.org (-7 / +9 lines)
32	#include <vtkCellData.h>	32	#include <vtkCellData.h>
33	#include <vtkDataSetAttributes.h>	33	#include <vtkDataSetAttributes.h>
34	#include <vtkDataSetCollection.h>	34	#include <vtkDataSetCollection.h>
		35	#include <vtkExecutive.h>
35	#include <vtkObjectFactory.h>	36	#include <vtkObjectFactory.h>
36	#include <vtkPointData.h>	37	#include <vtkPointData.h>
37	#include <vtkUnstructuredGrid.h>	38	#include <vtkUnstructuredGrid.h>
Lines 119-126 Link Here
119	vtkIdType aPntStartId = 0;	120	vtkIdType aPntStartId = 0;
120	vtkIdType aCellStartId = 0;	121	vtkIdType aCellStartId = 0;
121		122
122	for(vtkIdType aDataSetId = 0; aDataSetId < this->NumberOfInputs; ++aDataSetId){	123	for(vtkIdType aDataSetId = 0; aDataSetId < this->GetNumberOfInputConnections(0); ++aDataSetId){
123	vtkDataSet* aDataSet = (vtkDataSet *)(this->Inputs[aDataSetId]);	124	vtkDataSet* aDataSet = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,aDataSetId));
		125
124	// Do mapping of the nodes	126	// Do mapping of the nodes
125	if(!GetSharedPointsDataSet()){	127	if(!GetSharedPointsDataSet()){
126	vtkIdType aNbPnts = aDataSet->GetNumberOfPoints();	128	vtkIdType aNbPnts = aDataSet->GetNumberOfPoints();
Lines 265-275 Link Here
265		267
266	numCells = 0;	268	numCells = 0;
267		269
268	vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs);	270	vtkDataSetAttributes::FieldList cellList(this->GetNumberOfInputConnections(0));
269	int firstCD=1;	271	int firstCD=1;
270		272
271	for (idx = 0; idx < this->NumberOfInputs; ++idx) {	273	for (idx = 0; idx < this->GetNumberOfInputConnections(0); ++idx) {
272	ds = (vtkDataSet *)(this->Inputs[idx]);	274	ds = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,idx));
273	if (ds != NULL) {	275	if (ds != NULL) {
274	if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 ) {	276	if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 ) {
275	continue; //no input, just skip	277	continue; //no input, just skip
Lines 308-315 Link Here
308	output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData());	310	output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData());
309		311
310	// 2.cells	312	// 2.cells
311	for (idx = 0; idx < this->NumberOfInputs; ++idx) {	313	for (idx = 0; idx < this->GetNumberOfInputConnections(0); ++idx) {
312	ds = (vtkDataSet *)(this->Inputs[idx]);	314	ds = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,idx));
313	if (ds != NULL) {	315	if (ds != NULL) {
314	numCells = ds->GetNumberOfCells();	316	numCells = ds->GetNumberOfCells();
315	cd = ds->GetCellData();	317	cd = ds->GetCellData();

Lines 26-37 Link Here

(-)GUI_SRC_3.2.6/adm_local/Makefile.in.org (-2 / +2 lines)
26	all: resources	26	all: resources
27		27
28	install:	28	install:
29	cp -rf @top_srcdir@/adm_local @prefix@	29	# cp -rf @top_srcdir@/adm_local @prefix@
30		30
31	bin:	31	bin:
32		32
33	resources :	33	resources :
34	cp -rf @top_srcdir@/adm_local $(top_builddir)	34	# cp -rf @top_srcdir@/adm_local $(top_builddir)
35		35
36	inc:	36	inc:
37		37