From: fps Date: Tue, 17 Sep 2013 11:11:44 +0000 (+0000) Subject: minor update X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d1d1ae470430301db10765e29cf7cb1dae8fc3d7;p=modules%2Fgeom.git minor update --- diff --git a/src/XAO_Swig/Makefile.am b/src/XAO_Swig/Makefile.am index b95f8a5c0..8ca6b9ffd 100644 --- a/src/XAO_Swig/Makefile.am +++ b/src/XAO_Swig/Makefile.am @@ -43,7 +43,7 @@ _xao_swig_la_CPPFLAGS = \ -I$(srcdir)/../XAO \ -I$(top_builddir)/idl -_xao_swig_la_LDFLAGS = -module +_xao_swig_la_LDFLAGS = -module $(PYTHON_LIBS) _xao_swig_la_LIBADD = \ ../XAO/libXAO.la diff --git a/src/XAO_Swig/xao.py b/src/XAO_Swig/xao.py index 431bc0457..3d22dfce5 100644 --- a/src/XAO_Swig/xao.py +++ b/src/XAO_Swig/xao.py @@ -1,28 +1,22 @@ #!/usr/bin/env python # -*- coding: iso-8859-1 -*- -from xao_swig import * - -#from xao_swig import BOOLEAN, INTEGER, DOUBLE, STRING -#from xao_swig import VERTEX, EDGE, FACE, SOLID, WHOLE -#from xao_swig import BREP, STEP - -#from xao_swig import VectorBoolean, VectorDouble, VectorInteger, VectorString, VectorStep -#from xao_swig import VectorVectorBoolean, VectorVectorDouble, VectorVectorInteger, VectorVectorString -#from xao_swig import ListField, ListGroup, SetInt - -#from xao_swig import Field, BooleanField, IntegerField, DoubleField, StringField -#from xao_swig import Step, BooleanStep, IntegerStep, DoubleStep, StringStep -#from xao_swig import Xao, Group, Geometry, GeometricElement - -#from xao_swig import XAO_Exception - -#from xao_swig import BrepGeometry as _BrepGeometry - -#class BrepGeometry(_BrepGeometry): -# def setShape(self, shape): -# if shape is not None and 'GetShapeStream' in dir(shape): -# _BrepGeometry.setShape(self, shape.GetShapeStream()) -# else: -# raise XAO_Exception("toto") +# Copyright (C) 2013 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +from xao_swig import * diff --git a/src/XAO_Swig/xao_swig.i b/src/XAO_Swig/xao_swig.i index 01df965dc..335b5f7a3 100644 --- a/src/XAO_Swig/xao_swig.i +++ b/src/XAO_Swig/xao_swig.i @@ -24,6 +24,7 @@ %include "std_list.i" %include "std_map.i" %include "std_set.i" +%include "exception.i" namespace std { %template(ListGroup) list; @@ -63,3 +64,4 @@ namespace std %include XAO_Geometry.hxx %include XAO_BrepGeometry.hxx %include XAO_Xao.hxx +