Attachment #129993 for bug #174065




# Created by: Stas Timokhin <devel@stasyan.com>
# Date created:        20 May 2009
# Whom:            Stas Timokhin <devel@stasyan.com>
#
# $FreeBSD: head/cad/salome-gui/Makefile 307929 2012-11-28 19:15:53Z thierry $

PORTREVISION=	5
CATEGORIES=	cad science

MASTERDIR=	${.CURDIR}/../salome

PKGNAMESUFFIX=	-gui
SAL_MODULE_UPPER=	GUI

DEPRECATED=	BROKEN for more than 6 month
EXPIRATION_DATE=	2012-12-31

BROKEN=		does not compile

.include "${MASTERDIR}/Makefile"




--- src/SALOME_PY/SalomePy.cxx.orig	2010-06-17 12:55:19.000000000 -0230
+++ src/SALOME_PY/SalomePy.cxx	2012-09-13 17:12:24.000000000 -0230
@@ -205,8 +205,9 @@
     SVTK_ViewWindow* aVTKViewWindow = 
       ::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate );
     if( aVTKViewWindow && aPyClass ) {
-      vtkRenderer* aVTKObject = aVTKViewWindow->getRenderer();
-      myResult = PyVTKObject_New( aPyClass, aVTKObject );
+      PyObject* aVTKObject = (PyObject*)aVTKViewWindow->getRenderer();
+      vtkObjectBase *vtk_ptr;
+      myResult = PyVTKObject_New( aPyClass, aVTKObject, vtk_ptr );
     }
   }
 };
@@ -254,8 +255,9 @@
     SVTK_ViewWindow* aVTKViewWindow = 
       ::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate );
     if( aVTKViewWindow && aPyClass ) {
-      vtkRenderWindow* aVTKObject = aVTKViewWindow->getRenderWindow();
-      myResult = PyVTKObject_New( aPyClass, aVTKObject );
+      PyObject* aVTKObject = (PyObject*)aVTKViewWindow->getRenderWindow();
+      vtkObjectBase *vtk_ptr;
+      myResult = PyVTKObject_New( aPyClass, aVTKObject, vtk_ptr );
     }
   }
 };
@@ -303,8 +305,9 @@
     SVTK_ViewWindow* aVTKViewWindow = 
       ::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate );
     if( aVTKViewWindow && aPyClass ) {
-      vtkRenderWindowInteractor* aVTKObject = aVTKViewWindow->getInteractor();
-      myResult = PyVTKObject_New( aPyClass, aVTKObject );
+      PyObject* aVTKObject = (PyObject*)aVTKViewWindow->getInteractor();
+      vtkObjectBase *vtk_ptr;
+      myResult = PyVTKObject_New( aPyClass, aVTKObject, vtk_ptr );
     }
   }
 };




--- src/VTKViewer/VTKViewer_ArcBuilder.cxx.orig	2010-06-17 12:55:20.000000000 -0230
+++ src/VTKViewer/VTKViewer_ArcBuilder.cxx	2012-09-13 13:37:37.000000000 -0230
@@ -148,7 +148,9 @@
  * Calculate angle between vectors in degrees
  */
 double Vec::AngleBetweenInGrad(const Vec & Other){
-  return AngleBetween(Other)*vtkMath::DoubleRadiansToDegrees();
+  double res;
+  res = AngleBetween(Other);
+  return vtkMath::DegreesFromRadians(res);
 }
 
 /*
@@ -463,7 +465,7 @@
   double angle3 = GetPointAngleOnCircle(xCenter,yCenter,x3,y3);
   
   
-  double aMaxAngle = vtkMath::DoubleDegreesToRadians()*myAngle*2;   
+  double aMaxAngle = vtkMath::DegreesFromRadians(myAngle*2);   
   
   /*  double aTotalAngle =  fabs(angle3 - angle1);
   

Line 0 Link Here

(-)cad/salome-gui/files/patch-GUI_adm_local_unix_config_files_py-compile (+13 lines)
	1	--- adm_local/unix/config_files/py-compile.orig 2010-06-17 17:26:08.000000000 +0200
	2	+++ adm_local/unix/config_files/py-compile 2012-12-02 21:53:46.000000000 +0100
	3	@@ -48,10 +48,6 @@
	4	;;
	5	--destdir)
	6	destdir=$2
	7	- if test -z "$destdir"; then
	8	- echo "$0: Missing argument to --destdir." 1>&2
	9	- exit 1
	10	- fi
	11	shift
	12	;;
	13	-h\|--h*)




--- adm_local/unix/make_common_starter.am.orig	2012-09-28 11:29:12.000000000 +0700
+++ adm_local/unix/make_common_starter.am	2012-09-28 11:30:27.000000000 +0700
@@ -67,7 +67,8 @@
 # meta object implementation files generation (moc)
 %_moc.cxx: %.h
 	$(MOC) $(MOC_FLAGS) $< -o $@
-
+	sed -i -e 's|static_cast|dynamic_cast|;' $@
+
 # translation (*.qm) files generation (lrelease)
 %.qm: resources/%.ts
 	$(LRELEASE) $< -qm $@

Return to bug 174065

Lines 1-10 Link Here

(-)cad/salome-gui/Makefile (-10 / +2 lines)
1	# New ports collection makefile for: cad/salome-gui	1	# Created by: Stas Timokhin <devel@stasyan.com>
2	# Date created: 20 May 2009
3	# Whom: Stas Timokhin <devel@stasyan.com>
4	#
5	# $FreeBSD: head/cad/salome-gui/Makefile 307929 2012-11-28 19:15:53Z thierry $	2	# $FreeBSD: head/cad/salome-gui/Makefile 307929 2012-11-28 19:15:53Z thierry $
6		3
7	PORTREVISION= 4	4	PORTREVISION= 5
8	CATEGORIES= cad science	5	CATEGORIES= cad science
9		6
10	MASTERDIR= ${.CURDIR}/../salome	7	MASTERDIR= ${.CURDIR}/../salome
Lines 13-21 Link Here
13	PKGNAMESUFFIX= -gui	10	PKGNAMESUFFIX= -gui
14	SAL_MODULE_UPPER= GUI	11	SAL_MODULE_UPPER= GUI
15		12
16	DEPRECATED= BROKEN for more than 6 month
17	EXPIRATION_DATE= 2012-12-31
18
19	BROKEN= does not compile
20
21	.include "${MASTERDIR}/Makefile"	13	.include "${MASTERDIR}/Makefile"

Line 0 Link Here

(-)cad/salome-gui/files/patch-GUI_SalomePy.cxx (+38 lines)
	1	--- src/SALOME_PY/SalomePy.cxx.orig 2010-06-17 12:55:19.000000000 -0230
	2	+++ src/SALOME_PY/SalomePy.cxx 2012-09-13 17:12:24.000000000 -0230
	3	@@ -205,8 +205,9 @@
	4	SVTK_ViewWindow* aVTKViewWindow =
	5	::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate );
	6	if( aVTKViewWindow && aPyClass ) {
	7	- vtkRenderer* aVTKObject = aVTKViewWindow->getRenderer();
	8	- myResult = PyVTKObject_New( aPyClass, aVTKObject );
	9	+ PyObject* aVTKObject = (PyObject*)aVTKViewWindow->getRenderer();
	10	+ vtkObjectBase *vtk_ptr;
	11	+ myResult = PyVTKObject_New( aPyClass, aVTKObject, vtk_ptr );
	12	}
	13	}
	14	};
	15	@@ -254,8 +255,9 @@
	16	SVTK_ViewWindow* aVTKViewWindow =
	17	::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate );
	18	if( aVTKViewWindow && aPyClass ) {
	19	- vtkRenderWindow* aVTKObject = aVTKViewWindow->getRenderWindow();
	20	- myResult = PyVTKObject_New( aPyClass, aVTKObject );
	21	+ PyObject* aVTKObject = (PyObject*)aVTKViewWindow->getRenderWindow();
	22	+ vtkObjectBase *vtk_ptr;
	23	+ myResult = PyVTKObject_New( aPyClass, aVTKObject, vtk_ptr );
	24	}
	25	}
	26	};
	27	@@ -303,8 +305,9 @@
	28	SVTK_ViewWindow* aVTKViewWindow =
	29	::GetVTKViewWindow( myCreate ? __Create : __FindOrCreate );
	30	if( aVTKViewWindow && aPyClass ) {
	31	- vtkRenderWindowInteractor* aVTKObject = aVTKViewWindow->getInteractor();
	32	- myResult = PyVTKObject_New( aPyClass, aVTKObject );
	33	+ PyObject* aVTKObject = (PyObject*)aVTKViewWindow->getInteractor();
	34	+ vtkObjectBase *vtk_ptr;
	35	+ myResult = PyVTKObject_New( aPyClass, aVTKObject, vtk_ptr );
	36	}
	37	}
	38	};

Line 0 Link Here

(-)cad/salome-gui/files/patch-GUI_VTKViewer_ArcBuilder.cxx (+22 lines)
	1	--- src/VTKViewer/VTKViewer_ArcBuilder.cxx.orig 2010-06-17 12:55:20.000000000 -0230
	2	+++ src/VTKViewer/VTKViewer_ArcBuilder.cxx 2012-09-13 13:37:37.000000000 -0230
	3	@@ -148,7 +148,9 @@
	4	* Calculate angle between vectors in degrees
	5	*/
	6	double Vec::AngleBetweenInGrad(const Vec & Other){
	7	- return AngleBetween(Other)*vtkMath::DoubleRadiansToDegrees();
	8	+ double res;
	9	+ res = AngleBetween(Other);
	10	+ return vtkMath::DegreesFromRadians(res);
	11	}
	12
	13	/*
	14	@@ -463,7 +465,7 @@
	15	double angle3 = GetPointAngleOnCircle(xCenter,yCenter,x3,y3);
	16
	17
	18	- double aMaxAngle = vtkMath::DoubleDegreesToRadians()myAngle2;
	19	+ double aMaxAngle = vtkMath::DegreesFromRadians(myAngle*2);
	20
	21	/* double aTotalAngle = fabs(angle3 - angle1);
	22

Line 0 Link Here

(-)cad/salome-gui/files/patch-GUI_make_common.starter.am (+12 lines)
	1	--- adm_local/unix/make_common_starter.am.orig 2012-09-28 11:29:12.000000000 +0700
	2	+++ adm_local/unix/make_common_starter.am 2012-09-28 11:30:27.000000000 +0700
	3	@@ -67,7 +67,8 @@
	4	# meta object implementation files generation (moc)
	5	%_moc.cxx: %.h
	6	$(MOC) $(MOC_FLAGS) $< -o $@
	7	-
	8	+ sed -i -e 's\|static_cast\|dynamic_cast\|;' $@
	9	+
	10	# translation (*.qm) files generation (lrelease)
	11	%.qm: resources/%.ts
	12	$(LRELEASE) $< -qm $@