yfr : Merge with v1.2

This commit is contained in:
yfr 2003-07-10 09:42:33 +00:00
parent af37dd5465
commit bc4929c5bc
8 changed files with 161 additions and 39 deletions

View File

@ -27,7 +27,7 @@
# $Header$ # $Header$
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@ VPATH=.:@srcdir@

View File

@ -1,11 +1,31 @@
# -* Makefile *- # SMESH DriverUNV : driver to read and write 'unv' files
# #
# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#
# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
#
#
#
# File : Makefile.in
# Author : Marc Tajchman (CEA) # Author : Marc Tajchman (CEA)
# Date : 5/07/2001 # Module : SMESH
# $Header$ # $Header$
#
# source path
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@

View File

@ -3,7 +3,7 @@
# Module : SMESH # Module : SMESH
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@ VPATH=.:@srcdir@
@ -23,8 +23,8 @@ LIB_CLIENT_IDL =
LIB_SERVER_IDL = LIB_SERVER_IDL =
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
CXXFLAGS += $(OCC_CXXFLAGS) CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
LDFLAGS += $(OCC_LIBS) -lg2c LDFLAGS += $(OCC_LIBS) -lg2c

View File

@ -1,10 +1,34 @@
# source path # SMESH OBJECT : interactive object for SMESH visualization
#
# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#
# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
#
#
#
# File : Makefile.in
# Module : SMESH
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome
@COMMENCE@ @COMMENCE@
EXPORT_HEADERS = SMESH_Actor.h \ EXPORT_HEADERS = SMESH_Actor.h \

View File

@ -1,13 +1,32 @@
using namespace std; // SMESH OBJECT : interactive object for SMESH visualization
//
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
//
//
// File : SMESH_Actor.cxx // File : SMESH_Actor.cxx
// Created : Mon May 13 22:31:18 2002
// Author : Nicolas REJNERI // Author : Nicolas REJNERI
// Project : SALOME
// Module : SMESH // Module : SMESH
// Copyright : Open CASCADE 2002
// $Header$ // $Header$
using namespace std;
/*! /*!
\class SMESH_Actor SMESH_Actor.h \class SMESH_Actor SMESH_Actor.h
\brief ... \brief ...

View File

@ -1,13 +1,31 @@
// SMESH OBJECT : interactive object for SMESH visualization
//
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
//
//
// File : SMESH_Actor.h // File : SMESH_Actor.h
// Created : Mon May 13 22:30:51 2002
// Author : Nicolas REJNERI // Author : Nicolas REJNERI
// Project : SALOME
// Module : SMESH // Module : SMESH
// Copyright : Open CASCADE 2002
// $Header$ // $Header$
#ifndef SMESH_ACTOR_H #ifndef SMESH_ACTOR_H
#define SMESH_ACTOR_H #define SMESH_ACTOR_H

View File

@ -1,8 +1,31 @@
using namespace std; // SMESH OBJECT : interactive object for SMESH visualization
// File: SMESH_Grid.cxx //
// Created: Fri Sep 27 15:47:42 2002 // Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// Author: Nicolas REJNERI // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
//
//
// File : SMESH_Grid.cxx
// Author : Nicolas REJNERI
// Module : SMESH
using namespace std;
#include "SMESH_Grid.h" #include "SMESH_Grid.h"
#include "utilities.h" #include "utilities.h"

View File

@ -1,13 +1,31 @@
// SMESH OBJECT : interactive object for SMESH visualization
//
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
//
//
// File : SMESH_Grid.h // File : SMESH_Grid.h
// Created : Fri Sep 27 15:30:51 2002
// Author : Nicolas REJNERI // Author : Nicolas REJNERI
// Project : SALOME
// Module : SMESH // Module : SMESH
// Copyright : Open CASCADE 2002
// $Header$ // $Header$
#ifndef SMESH_GRID_H #ifndef SMESH_GRID_H
#define SMESH_GRID_H #define SMESH_GRID_H