From c35594d4a736cb27e332ed50148844f2da8089c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Ribes?= Date: Thu, 26 May 2011 15:53:52 +0200 Subject: [PATCH] samples -> examples + moins de debug --- Makefile.am | 2 +- adm_local/make_common_starter.am | 6 +++--- configure.ac | 8 ++++---- {samples => examples}/Makefile.am | 0 {samples => examples}/daSalome/Makefile.am | 2 +- .../daSalome/test001_ADAO_JDC_using_strings.comm | 0 .../daSalome/test002_ADAO_JDC_using_strings.comm | 0 .../daSalome/test003_ADAO_JDC_using_scripts.comm.in | 2 +- .../daSalome/test003_ADAO_scripts_for_JDC.py | 0 .../daSalome/test004_ADAO_JDC_using_scripts.comm.in | 2 +- .../daSalome/test004_ADAO_scripts_for_JDC.py | 0 src/daEficas/generator_adao.py | 4 +--- 12 files changed, 12 insertions(+), 14 deletions(-) rename {samples => examples}/Makefile.am (100%) rename {samples => examples}/daSalome/Makefile.am (94%) rename {samples => examples}/daSalome/test001_ADAO_JDC_using_strings.comm (100%) rename {samples => examples}/daSalome/test002_ADAO_JDC_using_strings.comm (100%) rename {samples => examples}/daSalome/test003_ADAO_JDC_using_scripts.comm.in (93%) rename {samples => examples}/daSalome/test003_ADAO_scripts_for_JDC.py (100%) rename {samples => examples}/daSalome/test004_ADAO_JDC_using_scripts.comm.in (94%) rename {samples => examples}/daSalome/test004_ADAO_scripts_for_JDC.py (100%) diff --git a/Makefile.am b/Makefile.am index 5ddf8d8..e1273bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ endif SUBDIRS += src if SALOME_MODULE -SUBDIRS += resources bin samples +SUBDIRS += resources bin examples endif if SPHINX_IS_OK diff --git a/adm_local/make_common_starter.am b/adm_local/make_common_starter.am index 7120e40..c03462c 100644 --- a/adm_local/make_common_starter.am +++ b/adm_local/make_common_starter.am @@ -17,9 +17,9 @@ testsdir = $(prefix)/tests testsdasalomedir = $(testsdir)/daSalome testsplateformedir = $(testsdir)/daComposant/Plateforme -# Directory for installing samples files -samplesdir = $(prefix)/share/salome/adao_samples -samplesdasalomedir = $(samplesdir)/daSalome +# Directory for installing examples files +examplesdir = $(prefix)/share/salome/adao_examples +examplesdasalomedir = $(examplesdir)/daSalome # Directories for installing admin files admlocaldir = $(prefix)/adm_local diff --git a/configure.ac b/configure.ac index 505b5ae..885875e 100644 --- a/configure.ac +++ b/configure.ac @@ -122,10 +122,10 @@ AC_CONFIG_FILES([ src/daSalome/daGUI/daUtils/Makefile src/daSalome/daGUI/daGuiImpl/Makefile src/daSalome/daGUI/daEficasWrapper/Makefile - samples/Makefile - samples/daSalome/Makefile - samples/daSalome/test003_ADAO_JDC_using_scripts.comm - samples/daSalome/test004_ADAO_JDC_using_scripts.comm + examples/Makefile + examples/daSalome/Makefile + examples/daSalome/test003_ADAO_JDC_using_scripts.comm + examples/daSalome/test004_ADAO_JDC_using_scripts.comm bin/Makefile bin/qtEficas_adao_study.py doc/Makefile diff --git a/samples/Makefile.am b/examples/Makefile.am similarity index 100% rename from samples/Makefile.am rename to examples/Makefile.am diff --git a/samples/daSalome/Makefile.am b/examples/daSalome/Makefile.am similarity index 94% rename from samples/daSalome/Makefile.am rename to examples/daSalome/Makefile.am index d40dd24..77d4f1d 100644 --- a/samples/daSalome/Makefile.am +++ b/examples/daSalome/Makefile.am @@ -8,7 +8,7 @@ DATA_INST = \ test004_ADAO_JDC_using_scripts.comm \ test004_ADAO_scripts_for_JDC.py -samplesdasalome_DATA = ${DATA_INST} +examplesdasalome_DATA = ${DATA_INST} EXTRA_DIST = \ test001_ADAO_JDC_using_strings.comm \ diff --git a/samples/daSalome/test001_ADAO_JDC_using_strings.comm b/examples/daSalome/test001_ADAO_JDC_using_strings.comm similarity index 100% rename from samples/daSalome/test001_ADAO_JDC_using_strings.comm rename to examples/daSalome/test001_ADAO_JDC_using_strings.comm diff --git a/samples/daSalome/test002_ADAO_JDC_using_strings.comm b/examples/daSalome/test002_ADAO_JDC_using_strings.comm similarity index 100% rename from samples/daSalome/test002_ADAO_JDC_using_strings.comm rename to examples/daSalome/test002_ADAO_JDC_using_strings.comm diff --git a/samples/daSalome/test003_ADAO_JDC_using_scripts.comm.in b/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in similarity index 93% rename from samples/daSalome/test003_ADAO_JDC_using_scripts.comm.in rename to examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in index c015723..c9096ea 100644 --- a/samples/daSalome/test003_ADAO_JDC_using_scripts.comm.in +++ b/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in @@ -1,6 +1,6 @@ ASSIMILATION_STUDY(Study_name='Test', - Study_repertory='@prefix@/share/salome/adao_samples/daSalome', + Study_repertory='@prefix@/share/salome/adao_examples/daSalome', Debug=0, Algorithm='3DVAR', Background=_F(INPUT_TYPE='Vector', diff --git a/samples/daSalome/test003_ADAO_scripts_for_JDC.py b/examples/daSalome/test003_ADAO_scripts_for_JDC.py similarity index 100% rename from samples/daSalome/test003_ADAO_scripts_for_JDC.py rename to examples/daSalome/test003_ADAO_scripts_for_JDC.py diff --git a/samples/daSalome/test004_ADAO_JDC_using_scripts.comm.in b/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in similarity index 94% rename from samples/daSalome/test004_ADAO_JDC_using_scripts.comm.in rename to examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in index a497a90..af7be9e 100644 --- a/samples/daSalome/test004_ADAO_JDC_using_scripts.comm.in +++ b/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in @@ -1,6 +1,6 @@ ASSIMILATION_STUDY(Study_name='Test', - Study_repertory='@prefix@/share/salome/adao_samples/daSalome', + Study_repertory='@prefix@/share/salome/adao_examples/daSalome', Debug=0, Algorithm='Blue', Background=_F(INPUT_TYPE='Vector', diff --git a/samples/daSalome/test004_ADAO_scripts_for_JDC.py b/examples/daSalome/test004_ADAO_scripts_for_JDC.py similarity index 100% rename from samples/daSalome/test004_ADAO_scripts_for_JDC.py rename to examples/daSalome/test004_ADAO_scripts_for_JDC.py diff --git a/src/daEficas/generator_adao.py b/src/daEficas/generator_adao.py index 93fc38e..786c553 100644 --- a/src/daEficas/generator_adao.py +++ b/src/daEficas/generator_adao.py @@ -27,7 +27,7 @@ class AdaoGenerator(PythonGenerator): self.text_da = "" self.text_da_status = False self.logger = logging.getLogger('ADAO EFICAS GENERATOR') - self.logger.setLevel(logging.DEBUG) + self.logger.setLevel(logging.INFO) ch = logging.StreamHandler() ch.setLevel(logging.DEBUG) formatter = logging.Formatter("%(name)s - %(levelname)s - %(message)s") @@ -65,8 +65,6 @@ class AdaoGenerator(PythonGenerator): """ clef="" for i in obj.get_genealogie() : - print obj - print obj.get_genealogie() clef=clef+"__"+i self.dictMCVal[clef]=obj.valeur -- 2.39.2