From 5bc321f2aac937a51422c58b9351c196e9ac40a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Ribes?= Date: Wed, 23 Feb 2011 10:37:47 +0100 Subject: [PATCH] =?utf8?q?Modification=20de=20l'ENGINE=20pour=20pouvoir=20?= =?utf8?q?avoir=20l'icone=20dans=20l'=C3=A9tude?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- idl/{ADAO.idl => ADAO_COMPONENT.idl} | 4 +-- idl/Makefile.am | 26 +++++++++---------- resources/ADAOCatalog.xml | 2 +- .../daGUI/{ADAO_ENGINE.py => ADAO.py} | 8 +++--- src/daSalome/daGUI/Makefile.am | 2 +- .../daGUI/daGuiImpl/adaoModuleHelper.py | 4 +-- 6 files changed, 23 insertions(+), 23 deletions(-) rename idl/{ADAO.idl => ADAO_COMPONENT.idl} (69%) rename src/daSalome/daGUI/{ADAO_ENGINE.py => ADAO.py} (91%) diff --git a/idl/ADAO.idl b/idl/ADAO_COMPONENT.idl similarity index 69% rename from idl/ADAO.idl rename to idl/ADAO_COMPONENT.idl index e0a9650..1437957 100644 --- a/idl/ADAO.idl +++ b/idl/ADAO_COMPONENT.idl @@ -5,9 +5,9 @@ #include "SALOME_Component.idl" #include "DSC_Engines.idl" -module ADAO +module ADAO_COMPONENT { - interface ADAO_COMPONENT : Engines::Component, SALOMEDS::Driver + interface ADAO_ENGINE : Engines::Component, SALOMEDS::Driver { /*! * Test that the component is ok 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_ENGINE.py b/src/daSalome/daGUI/ADAO.py similarity index 91% rename from src/daSalome/daGUI/ADAO_ENGINE.py rename to src/daSalome/daGUI/ADAO.py index 10cc610..0d1e1e3 100644 --- a/src/daSalome/daGUI/ADAO_ENGINE.py +++ b/src/daSalome/daGUI/ADAO.py @@ -17,15 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import ADAO__POA +import ADAO_COMPONENT__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): +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 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(): -- 2.39.2