From 65d7c86914e226f8d8329460b416d195026042a1 Mon Sep 17 00:00:00 2001 From: yfr Date: Fri, 18 Jun 2004 13:39:12 +0000 Subject: [PATCH] DCQ : Merge with Ecole_Ete_a6. --- INSTALL | 4 +- bin/VERSION | 2 +- idl/AddComponent.idl | 1 + idl/Calculator.idl | 49 ++++++++++++++++++++++++ idl/DataStreamComponent.idl | 76 +++++++++++++++++++++++++++++++++++++ idl/FactorialComponent.idl | 1 + idl/Makefile.in | 61 +++++++++++++++++++---------- 7 files changed, 172 insertions(+), 22 deletions(-) create mode 100644 idl/Calculator.idl create mode 100644 idl/DataStreamComponent.idl diff --git a/INSTALL b/INSTALL index f03164b..3c6977b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,3 +1,3 @@ -This is the version 1.4.1 of COMPONENT +This is the version 2.0.0 of COMPONENT Compatible with : - - KERNEL 1.4.1 + - KERNEL 2.0.0 diff --git a/bin/VERSION b/bin/VERSION index 4a0040e..7225be5 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - COMPONENT VERSION: 1.4.1 +THIS IS SALOME - COMPONENT VERSION: 2.0.0 diff --git a/idl/AddComponent.idl b/idl/AddComponent.idl index 08b8ab3..9806f9f 100644 --- a/idl/AddComponent.idl +++ b/idl/AddComponent.idl @@ -35,6 +35,7 @@ module SuperVisionTest { interface AddComponent : Engines::Component { Adder Addition() ; double Add( in double x , in double y , out double z ) ; + long Sigma( in long n ) ; double LastResult() ; }; diff --git a/idl/Calculator.idl b/idl/Calculator.idl new file mode 100644 index 0000000..bd29f69 --- /dev/null +++ b/idl/Calculator.idl @@ -0,0 +1,49 @@ +// 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 : Calculator.idl +// Author : Laurent DADA CEA +// $Header$ + +#ifndef CALCULATOR_IDL +#define CALCULATOR_IDL + +#include "SALOME_Component.idl" +#include "MED.idl" + + +module SuperVisionTest { + +interface Calculator : Engines::Component +{ + + SALOME_MED::FIELDDOUBLE PutToStudy(in SALOME_MED::FIELDDOUBLE field1, in long theStudyId); + SALOME_MED::FIELDDOUBLE Add(in SALOME_MED::FIELDDOUBLE field1, in SALOME_MED::FIELDDOUBLE field2); + SALOME_MED::FIELDDOUBLE Mul(in SALOME_MED::FIELDDOUBLE field1, in double x1); + SALOME_MED::FIELDDOUBLE Constant(in SALOME_MED::FIELDDOUBLE field1, in double x1); + void writeMEDfile(in SALOME_MED::FIELDDOUBLE field1, in string fileName); + +}; +}; + + + +#endif diff --git a/idl/DataStreamComponent.idl b/idl/DataStreamComponent.idl new file mode 100644 index 0000000..ebbe279 --- /dev/null +++ b/idl/DataStreamComponent.idl @@ -0,0 +1,76 @@ +// 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 : DataStreamComponent.idl +// Author : Jean Rahuel +// $Header: + +#ifndef _DATASTREAMCOMPONENT_IDL +#define _DATASTREAMCOMPONENT_IDL + +#include "SALOME_Component.idl" + +module DataStreamComponent { + + interface DataStream ; + + interface DataStreamFactory : Engines::Component { + + // DataStreamPorts Setxy istream(INTEGER, in, T), ostream(INTEGER, out, T) + void Setxy( in long x , in long y ) ; + + void Getxy( out long x , out long y ) ; + + // DataStreamPorts Add istream(INTEGER, in, I), ostream(INTEGER, out, I), OStream(INTEGER, out, I ) + void Add( in long x , in long y , out long z ) ; + + // DataStreamPorts Sub istream(INTEGER, in, I), Istream(INTEGER, in, I) + void Sub( in long x , in long y , out long z ) ; + + void Mul( in long x , in long y , out long z ) ; + + // DataStreamPorts Div ostream(INTEGER, out, I) + void Div( in long x , in long y , out long z ) ; + + DataStream NewDataStream() ; + + }; + + interface DataStream : Engines::Component { + + // DataStreamPorts StreamSetxy istream(INTEGER, in, T), ostream(INTEGER, out, T) + void StreamSetxy( in long x , in long y ) ; + + void StreamGetxy( out long x , out long y ) ; + + // DataStreamPorts StreamAdd istream(INTEGER, in, I), ostream(INTEGER, out, I), OStream(INTEGER, out, I ) + void StreamAdd( in long x , in long y , out long z ) ; + // DataStreamPorts StreamSub istream(INTEGER, in, I), Istream(INTEGER, in, I) + void StreamSub( in long x , in long y , out long z ) ; + void StreamMul( in long x , in long y , out long z ) ; + // DataStreamPorts StreamDiv ostream(INTEGER, out, I) + void StreamDiv( in long x , in long y , out long z ) ; + + }; + +} ; + +#endif diff --git a/idl/FactorialComponent.idl b/idl/FactorialComponent.idl index 6ac4439..8ed5ff2 100644 --- a/idl/FactorialComponent.idl +++ b/idl/FactorialComponent.idl @@ -29,6 +29,7 @@ module SuperVisionTest { interface FactorialComponent : Engines::Component { long eval(in long n); + long sigma(in long n); }; }; diff --git a/idl/Makefile.in b/idl/Makefile.in index 9ddf083..cf7ccbd 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -1,33 +1,56 @@ -# -# generate dependencies for idl file : +# 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 # -# source path +# +# +# File : Makefile.in +# Module : idl top_srcdir=@top_srcdir@ top_builddir=.. srcdir=@srcdir@ -VPATH=.:$(srcdir):${KERNEL_ROOT_DIR}/idl/salome +VPATH=.:${KERNEL_ROOT_DIR}/idl/salome @COMMENCE@ IDL_FILES = \ - AddComponent.idl \ - MulComponent.idl \ - SyrControlComponent.idl \ - DivComponent.idl \ - SubComponent.idl \ - FactorialComponent.idl \ - SyrComponent.idl \ - TypesCheck.idl + AddComponent.idl \ + DivComponent.idl \ + FactorialComponent.idl \ + MulComponent.idl \ + SubComponent.idl \ + SyrComponent.idl \ + SyrControlComponent.idl \ + TypesCheck.idl \ + DataStreamComponent.idl PY_CLIENT_IDL = $(IDL_FILES) # we copy all idl file in $(top_builddir)/idl -inc: $(IDL_FILES:%=$(top_builddir)/idl/%) +inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%) + +$(top_builddir)/idl/salome: + mkdir $@ -$(IDL_FILES:%=$(top_builddir)/idl/%):$(top_builddir)/idl/%:% +$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) # $(CP) $< $@ - cp -f $< $@ + cp -f $^ $(top_builddir)/idl/salome lib: pyidl @@ -39,7 +62,7 @@ pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) $(PYTHON_BUILD_SITE): $(INSTALL) -d $@ -$(PYTHON_BUILD_SITE)/%_idl.py: %.idl +$(PYTHON_BUILD_SITE)/%_idl.py: $(top_builddir)/idl/salome/%.idl $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $< @@ -47,12 +70,12 @@ $(PYTHON_BUILD_SITE)/%_idl.py: %.idl install: install-pyidl install-idl # create directory $(idldir) and copy idl files into it -install-idl: $(IDL_FILES) +install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) $(INSTALL) -d $(idldir) $(INSTALL_DATA) $^ $(idldir) -install-pyidl: $(IDL_FILES) +install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) $(INSTALL) -d $(PYTHON_SITE_INSTALL) @for file in $^ dummy; do \ if [ $$file != "dummy" ]; then \ @@ -67,6 +90,6 @@ cleandep: distclean: -$(RM) *.py - -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/%) + -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%) -$(RM) Makefile -- 2.39.2