From: André Ribes Date: Wed, 23 Feb 2011 09:37:47 +0000 (+0100) Subject: Modification de l'ENGINE pour pouvoir avoir l'icone dans l'étude X-Git-Tag: V6_4_0rc3~83 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5bc321f2aac937a51422c58b9351c196e9ac40a8;p=modules%2Fadao.git Modification de l'ENGINE pour pouvoir avoir l'icone dans l'étude --- diff --git a/idl/ADAO.idl b/idl/ADAO.idl deleted file mode 100644 index e0a9650..0000000 --- a/idl/ADAO.idl +++ /dev/null @@ -1,18 +0,0 @@ - -#ifndef _ADAO_IDL_ -#define _ADAO_IDL_ - -#include "SALOME_Component.idl" -#include "DSC_Engines.idl" - -module ADAO -{ - interface ADAO_COMPONENT : Engines::Component, SALOMEDS::Driver - { - /*! - * Test that the component is ok - */ - void print_ping(); - }; -}; -#endif diff --git a/idl/ADAO_COMPONENT.idl b/idl/ADAO_COMPONENT.idl new file mode 100644 index 0000000..1437957 --- /dev/null +++ b/idl/ADAO_COMPONENT.idl @@ -0,0 +1,18 @@ + +#ifndef _ADAO_IDL_ +#define _ADAO_IDL_ + +#include "SALOME_Component.idl" +#include "DSC_Engines.idl" + +module ADAO_COMPONENT +{ + interface ADAO_ENGINE : Engines::Component, SALOMEDS::Driver + { + /*! + * Test that the component is ok + */ + void print_ping(); + }; +}; +#endif diff --git a/idl/Makefile.am b/idl/Makefile.am index 7cd8c93..f1ccf32 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,17 +1,17 @@ include $(top_srcdir)/adm_local/make_common_starter.am -BUILT_SOURCES = ADAOSK.cc -IDL_FILES=ADAO.idl +BUILT_SOURCES = ADAO_COMPONENTSK.cc +IDL_FILES=ADAO_COMPONENT.idl -lib_LTLIBRARIES = libADAO.la +lib_LTLIBRARIES = libADAO_COMPONENT.la salomeidl_DATA = $(IDL_FILES) -salomepython_DATA = ADAO_idl.py -libADAO_la_SOURCES = -nodist_libADAO_la_SOURCES = ADAOSK.cc -nodist_salomeinclude_HEADERS= ADAO.hh -libADAO_la_CXXFLAGS = -I. $(KERNEL_INCLUDES) -libADAO_la_LIBADD = $(KERNEL_LIBS) +salomepython_DATA = ADAO_COMPONENT_idl.py +libADAO_COMPONENT_la_SOURCES = +nodist_libADAO_COMPONENT_la_SOURCES = ADAO_COMPONENTSK.cc +nodist_salomeinclude_HEADERS= ADAO_COMPONENT.hh +libADAO_COMPONENT_la_CXXFLAGS = -I. $(KERNEL_INCLUDES) +libADAO_COMPONENT_la_LIBADD = $(KERNEL_LIBS) ########################################################## %SK.cc %.hh : %.idl $(OMNIORB_IDL) -bcxx $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $(IDL_INCLUDES) $< @@ -25,12 +25,12 @@ CLEANFILES = *.hh *SK.cc *.py *.hxx *.cxx EXTRA_DIST = $(IDL_FILES) clean-local: - rm -rf ADAO ADAO__POA + rm -rf ADAO_COMPONENT ADAO_COMPONENT__POA install-data-local: ${mkinstalldirs} $(DESTDIR)$(salomepythondir) - cp -R ADAO ADAO__POA $(DESTDIR)$(salomepythondir) + cp -R ADAO_COMPONENT ADAO_COMPONENT__POA $(DESTDIR)$(salomepythondir) uninstall-local: - rm -rf $(DESTDIR)$(salomepythondir)/ADAO - rm -rf $(DESTDIR)$(salomepythondir)/ADAO__POA + rm -rf $(DESTDIR)$(salomepythondir)/ADAO_COMPONENT + rm -rf $(DESTDIR)$(salomepythondir)/ADAO_COMPONENT__POA diff --git a/resources/ADAOCatalog.xml b/resources/ADAOCatalog.xml index 8dc7884..238cff2 100644 --- a/resources/ADAOCatalog.xml +++ b/resources/ADAOCatalog.xml @@ -17,7 +17,7 @@ - ADAO_ENGINE + ADAO diff --git a/src/daSalome/daGUI/ADAO.py b/src/daSalome/daGUI/ADAO.py new file mode 100644 index 0000000..0d1e1e3 --- /dev/null +++ b/src/daSalome/daGUI/ADAO.py @@ -0,0 +1,47 @@ +# Copyright (C) 2011 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 +# + +import ADAO_COMPONENT__POA +import SALOME_ComponentPy +import SALOME_DriverPy + +from daGuiImpl.adaoLogger import * + +class ADAO(ADAO_COMPONENT__POA.ADAO_ENGINE, + SALOME_ComponentPy.SALOME_ComponentPy_i, + SALOME_DriverPy.SALOME_DriverPy_i): + """ + Pour etre un composant SALOME cette classe Python + doit avoir le nom du composant et heriter de la + classe ADAO_COMPONENT issue de la compilation de l'idl + par omniidl et de la classe SALOME_ComponentPy_i + qui porte les services generaux d'un composant SALOME + """ + def __init__ ( self, orb, poa, contID, containerName, instanceName, + interfaceName ): + debug("Creating ADAO component instance", "ENGINE") + SALOME_ComponentPy.SALOME_ComponentPy_i.__init__(self, orb, poa, + contID, containerName, instanceName, interfaceName, 0) + SALOME_DriverPy.SALOME_DriverPy_i.__init__(self, interfaceName) + + # On stocke dans l'attribut _naming_service, une ref sur le Naming Service + self._naming_service = SALOME_ComponentPy.SALOME_NamingServicePy_i( self._orb ) + + def print_ping(): + info("ADAO ENGINE Ping", "ENGINE") diff --git a/src/daSalome/daGUI/ADAO_ENGINE.py b/src/daSalome/daGUI/ADAO_ENGINE.py deleted file mode 100644 index 10cc610..0000000 --- a/src/daSalome/daGUI/ADAO_ENGINE.py +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (C) 2011 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 -# - -import ADAO__POA -import SALOME_ComponentPy -import SALOME_DriverPy - -from daGuiImpl.adaoLogger import * - -class ADAO_ENGINE(ADAO__POA.ADAO_COMPONENT, - SALOME_ComponentPy.SALOME_ComponentPy_i, - SALOME_DriverPy.SALOME_DriverPy_i): - """ - Pour etre un composant SALOME cette classe Python - doit avoir le nom du composant et heriter de la - classe ADAO_COMPONENT issue de la compilation de l'idl - par omniidl et de la classe SALOME_ComponentPy_i - qui porte les services generaux d'un composant SALOME - """ - def __init__ ( self, orb, poa, contID, containerName, instanceName, - interfaceName ): - debug("Creating ADAO component instance", "ENGINE") - SALOME_ComponentPy.SALOME_ComponentPy_i.__init__(self, orb, poa, - contID, containerName, instanceName, interfaceName, 0) - SALOME_DriverPy.SALOME_DriverPy_i.__init__(self, interfaceName) - - # On stocke dans l'attribut _naming_service, une ref sur le Naming Service - self._naming_service = SALOME_ComponentPy.SALOME_NamingServicePy_i( self._orb ) - - def print_ping(): - info("ADAO ENGINE Ping", "ENGINE") diff --git a/src/daSalome/daGUI/Makefile.am b/src/daSalome/daGUI/Makefile.am index a813d87..e08e5f2 100644 --- a/src/daSalome/daGUI/Makefile.am +++ b/src/daSalome/daGUI/Makefile.am @@ -21,4 +21,4 @@ SUBDIRS = daUtils daGuiImpl daEficasWrapper include $(top_srcdir)/adm_local/make_common_starter.am -salomepython_PYTHON= ADAOGUI.py ADAO_ENGINE.py +salomepython_PYTHON= ADAOGUI.py ADAO.py diff --git a/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py b/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py index a80eb83..6f1af04 100644 --- a/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py +++ b/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py @@ -74,7 +74,7 @@ def componentName(): # Note that this name should be (i) the name used for the class implementing # the component CORBA interface and (ii) the name used to declare the component # in the catalog of the module. - return "ADAO_ENGINE" + return "ADAO" # _MEM_ we use here the tr() translation methode to manage constant parameters # in the application. We could have specified instead constant values directly @@ -89,7 +89,7 @@ def modulePixmap(): """ Get the reference pixmap for this module. """ - return "ADAO.png" + return "ADAO_small.png" __verbose__ = None def verbose():