From a0d75a92a4398daa47775f24295bc902a3f1db64 Mon Sep 17 00:00:00 2001 From: nri Date: Wed, 9 Jul 2003 16:10:27 +0000 Subject: [PATCH] NRI : Merge from V1_2. --- idl/SALOME_ModuleCatalog.idl | 30 ++++++++-- idl/SALOME_Session.idl | 34 +++++++---- src/Makefile.in | 34 ++++++++--- src/Session/Makefile.in | 2 +- src/Session/SALOME_Session_i.cxx | 56 +++++++++++++------ src/Session/SALOME_Session_i.hxx | 41 ++++++++++---- src/TOOLSDS/Makefile.in | 2 +- src/TOOLSGUI/Makefile.in | 30 ++++++++-- src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx | 35 +++++++++--- src/Utils/SALOME_utilities.py | 9 +++ src/Utils/utilities.py | 9 +++ 11 files changed, 213 insertions(+), 69 deletions(-) diff --git a/idl/SALOME_ModuleCatalog.idl b/idl/SALOME_ModuleCatalog.idl index 789722be4..3f6bfaefb 100644 --- a/idl/SALOME_ModuleCatalog.idl +++ b/idl/SALOME_ModuleCatalog.idl @@ -1,9 +1,27 @@ -// File: SALOME_ModuleCatalog.idl -// Created: Tue June 25 2001 -// Author: Estelle Deville -// Project: SALOME -// Copyright : CEA/DEN/DMSS/LGLS -// $Header$ +// 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 : SALOME_ModuleCatalog.idl +// Author : Estelle Deville +// $Header$ /*! \file SALOME_ModuleCatalog.idl This file conatins a set of interfaces used for creation of the catalog of components in %SALOME application diff --git a/idl/SALOME_Session.idl b/idl/SALOME_Session.idl index 9601cb102..7d1d5a7c4 100644 --- a/idl/SALOME_Session.idl +++ b/idl/SALOME_Session.idl @@ -1,14 +1,28 @@ -//============================================================================= -// File : SALOME_Session.idl -// Created : mar jun 19 09:15:07 CEST 2001 -// Author : Paul RASCLE, EDF -// Project : SALOME -// Copyright : EDF 2001 -// $Header$ -//============================================================================= +// 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 : SALOME_Session.idl +// Author : Paul RASCLE, EDF +// $Header$ - -//***//#include "VISU_Gen.idl" #include "SALOME_Component.idl" /*! \defgroup Kernel SALOME KERNEL module */ diff --git a/src/Makefile.in b/src/Makefile.in index 4a57fd0c3..e36944512 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,13 +1,31 @@ -# -* Makefile *- +# 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 +# # -# Author : Patrick GOLDBRONN (CEA) -# Date : 28/06/2001 -# $Header$ # +# File : Makefile.in +# Author : Patrick GOLDBRONN (CEA) +# Module : SALOME +# $Header$ -# source path top_srcdir=@top_srcdir@ -top_builddir=.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@ @@ -16,9 +34,9 @@ VPATH=.:@srcdir@ SUBDIRS = MSG2QM Logger Utils PatchQt NamingService Registry ModuleCatalog DataTypeCatalog \ RessourcesCatalog Notification NOTIFICATION_SWIG Container TestContainer LifeCycleCORBA \ - HDFPersist OBJECT SALOMEDS SALOMEGUI Plot2d VTKViewer OCCViewer SUPERVGraph Session Loader\ + HDFPersist OBJECT TOOLSDS SALOMEDS SALOMEGUI Plot2d VTKViewer OCCViewer SUPERVGraph Session \ SALOME_SWIG TOOLSGUI SALOME_PY RegistryDisplay ModuleGenerator \ - SALOME_PYQT + SALOME_PYQT Loader ifeq (@WITHMPICH@,yes) SUBDIRS+= MPIContainer diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in index 2448c8e77..c6a7ffbe0 100644 --- a/src/Session/Makefile.in +++ b/src/Session/Makefile.in @@ -28,7 +28,7 @@ # source path top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/Session/SALOME_Session_i.cxx b/src/Session/SALOME_Session_i.cxx index c57e4cd99..41b68e818 100644 --- a/src/Session/SALOME_Session_i.cxx +++ b/src/Session/SALOME_Session_i.cxx @@ -1,13 +1,32 @@ -using namespace std; -//============================================================================= -// File : SALOME_Session_i.cxx -// Created : mar jun 19 14:02:45 CEST 2001 -// Author : Paul RASCLE, EDF -// Project : SALOME -// Copyright : EDF 2001 -// $Header$ -//============================================================================= +// SALOME Session : implementation of Session.idl +// +// 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 : SALOME_Session_i.cxx +// Author : Paul RASCLE, EDF +// Module : SALOME +// $Header$ +using namespace std; #include "utilities.h" #include "SALOME_Session_i.hxx" @@ -41,15 +60,16 @@ SALOME_Session_i::SALOME_Session_i(int argc, char ** argv, CORBA::ORB_ptr orb, P MESSAGE("constructor end"); } -//***//VISU::VISU_Gen_ptr SALOME_Session_i::GetVisuGen(){ -//***// typedef VISU::VISU_Gen_ptr VisuGen(CORBA::ORB_var,PortableServer::POA_var,QMutex*); -//***// MESSAGE("SALOME_Session_i::GetVisuGen"); -//***// OSD_SharedLibrary visuSharedLibrary("libVisuEngine.so"); -//***// if(visuSharedLibrary.DlOpen(OSD_RTLD_LAZY)) -//***// if(OSD_Function osdFun = visuSharedLibrary.DlSymb("GetVisuGen")) -//***// return ((VisuGen (*)) osdFun)(_orb,_poa,&_GUIMutex); -//***// return VISU::VISU_Gen::_nil(); -//***//} +Engines::Component_ptr SALOME_Session_i::GetVisuGen(){ + typedef Engines::Component_ptr VisuGen(CORBA::ORB_ptr, PortableServer::POA_ptr, + SALOME_NamingService*, QMutex*); + MESSAGE("SALOME_Session_i::GetVisuGen"); + OSD_SharedLibrary visuSharedLibrary("libVisuEngine.so"); + if(visuSharedLibrary.DlOpen(OSD_RTLD_LAZY)) + if(OSD_Function osdFun = visuSharedLibrary.DlSymb("GetVisuGen")) + return ((VisuGen (*)) osdFun)(_orb,_poa,_NS,&_GUIMutex); + return Engines::Component::_nil(); +} Engines::Component_ptr SALOME_Session_i::GetVisuComponent() { MESSAGE("SALOME_Session_i::GetVisuGen"); diff --git a/src/Session/SALOME_Session_i.hxx b/src/Session/SALOME_Session_i.hxx index ef7a55f08..93d1f77cf 100644 --- a/src/Session/SALOME_Session_i.hxx +++ b/src/Session/SALOME_Session_i.hxx @@ -1,11 +1,30 @@ -//============================================================================= -// File : SALOME_Session_i.hxx -// Created : mar jun 19 13:42:55 CEST 2001 -// Author : Paul RASCLE, EDF -// Project : SALOME -// Copyright : EDF 2001 -// $Header$ -//============================================================================= +// SALOME Session : implementation of Session.idl +// +// 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 : SALOME_Session_i.hxx +// Author : Paul RASCLE, EDF +// Module : SALOME +// $Header$ #ifndef _SALOME_SESSION_I_HXX_ #define _SALOME_SESSION_I_HXX_ @@ -19,10 +38,8 @@ class SALOME_NamingService; class SALOME_Session_QThread; -//! CORBA SALOME Session Servant - -class SALOME_Session_i: public POA_SALOME::Session, - public PortableServer::RefCountServantBase +class SALOME_Session_i: public virtual POA_SALOME::Session, + public virtual PortableServer::RefCountServantBase { public: SALOME_Session_i(int argc, char ** argv, CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) ; diff --git a/src/TOOLSDS/Makefile.in b/src/TOOLSDS/Makefile.in index e4e5fc028..fe5211407 100644 --- a/src/TOOLSDS/Makefile.in +++ b/src/TOOLSDS/Makefile.in @@ -5,7 +5,7 @@ # source path top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl diff --git a/src/TOOLSGUI/Makefile.in b/src/TOOLSGUI/Makefile.in index 1ea508674..a51debd21 100644 --- a/src/TOOLSGUI/Makefile.in +++ b/src/TOOLSGUI/Makefile.in @@ -1,11 +1,31 @@ -# -* Makefile *- +# SALOME TOOLSGUI : implementation of desktop "Tools" optioins # -# Author : Marc Tajchman (CEA) -# Date : 5/07/2001 -# $Header$ +# 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) +# Module : SALOME +# $Header$ -# source path top_srcdir=@top_srcdir@ top_builddir=../.. srcdir=@srcdir@ diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx index 970b0d591..1147a6e37 100644 --- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx +++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx @@ -1,13 +1,32 @@ -using namespace std; -// File : ToolsGUI_CatalogGeneratorDlg.cxx -// Created : Thu Apr 25 18:52:40 2002 -// Author : Nicolas REJNERI - -// Project : SALOME -// Module : TOOLSGUI -// Copyright : Open CASCADE 2002 +// SALOME TOOLSGUI : implementation of desktop "Tools" optioins +// +// 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 : ToolsGUI_CatalogGeneratorDlg.cxx +// Author : Nicolas REJNERI +// Module : SALOME // $Header$ +using namespace std; #include "ToolsGUI_CatalogGeneratorDlg.h" #include "QAD_Application.h" diff --git a/src/Utils/SALOME_utilities.py b/src/Utils/SALOME_utilities.py index f21c17457..bf18aaf70 100644 --- a/src/Utils/SALOME_utilities.py +++ b/src/Utils/SALOME_utilities.py @@ -1,3 +1,12 @@ +# SALOME Utils : general SALOME's definitions and tools +# +# Copyright (C) 2003 CEA/DEN, EDF R&D +# +# +# +# File : SALOME_utilities.py +# Module : SALOME + import SALOME_Trace GLogger = SALOME_Trace.SALOME_Trace() diff --git a/src/Utils/utilities.py b/src/Utils/utilities.py index f21c17457..9c2093540 100644 --- a/src/Utils/utilities.py +++ b/src/Utils/utilities.py @@ -1,3 +1,12 @@ +# SALOME Utils : general SALOME's definitions and tools +# +# Copyright (C) 2003 CEA/DEN, EDF R&D +# +# +# +# File : utilities.py +# Module : SALOME + import SALOME_Trace GLogger = SALOME_Trace.SALOME_Trace() -- 2.39.2