From 6a033450ee6ef0b1b9104db784707eeb551d7ca7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Ribes?= Date: Wed, 16 Jun 2010 12:05:34 +0200 Subject: [PATCH] - daEficas: DATASSIM -> ADAO --- .../{DATASSIM_Cata_V0.py => ADAO_Cata_V0.py} | 2 +- src/daEficas/Makefile.am | 12 ++++++------ ...nfiguration_DATASSIM.py => configuration_ADAO.py} | 8 ++++---- .../{convert_datassim.py => convert_adao.py} | 4 ++-- .../{generator_datassim.py => generator_adao.py} | 12 ++++++------ src/daEficas/prefs.py | 2 +- src/daEficas/prefs_ADAO.py.in | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) rename src/daEficas/{DATASSIM_Cata_V0.py => ADAO_Cata_V0.py} (99%) rename src/daEficas/{configuration_DATASSIM.py => configuration_ADAO.py} (74%) rename src/daEficas/{convert_datassim.py => convert_adao.py} (86%) rename src/daEficas/{generator_datassim.py => generator_adao.py} (94%) diff --git a/src/daEficas/DATASSIM_Cata_V0.py b/src/daEficas/ADAO_Cata_V0.py similarity index 99% rename from src/daEficas/DATASSIM_Cata_V0.py rename to src/daEficas/ADAO_Cata_V0.py index 431e09b..4d969c7 100644 --- a/src/daEficas/DATASSIM_Cata_V0.py +++ b/src/daEficas/ADAO_Cata_V0.py @@ -7,7 +7,7 @@ import Accas from Accas import * -JdC = JDC_CATA (code = 'DATASSIM', +JdC = JDC_CATA (code = 'ADAO', execmodul = None, regles = ( AU_MOINS_UN ('ASSIM_STUDY')), ) diff --git a/src/daEficas/Makefile.am b/src/daEficas/Makefile.am index bb1f4f5..ba14af5 100644 --- a/src/daEficas/Makefile.am +++ b/src/daEficas/Makefile.am @@ -22,12 +22,12 @@ include $(top_srcdir)/adm_local/make_common_starter.am mypkgpythondir =$(salomepythondir)/daEficas mypkgpython_PYTHON = \ - configuration_DATASSIM.py \ - convert_datassim.py \ - DATASSIM_Cata_V0.py \ - generator_datassim.py \ + configuration_ADAO.py \ + convert_adao.py \ + ADAO_Cata_V0.py \ + generator_adao.py \ __init__.py \ - prefs_DATASSIM.py \ + prefs_ADAO.py \ prefs.py -EXTRA_DIST = prefs_DATASSIM.py.in +EXTRA_DIST = prefs_ADAO.py.in diff --git a/src/daEficas/configuration_DATASSIM.py b/src/daEficas/configuration_ADAO.py similarity index 74% rename from src/daEficas/configuration_DATASSIM.py rename to src/daEficas/configuration_ADAO.py index 14eb428..a5a30c3 100644 --- a/src/daEficas/configuration_DATASSIM.py +++ b/src/daEficas/configuration_ADAO.py @@ -3,7 +3,7 @@ Ce module sert pour charger les paramètres de configuration d'EFICAS """ # Modules Python -print "passage dans la surcharge de configuration pour Datassim" +print "passage dans la surcharge de configuration pour Adao" import os, sys, string, types, re import traceback from PyQt4.QtGui import * @@ -22,13 +22,13 @@ class CONFIG: self.code = appli.code self.rep_ini = repIni self.savedir = self.rep_user - self.generator_module = "generator_datassim" - self.convert_module = "convert_datassim" + self.generator_module = "generator_adao" + self.convert_module = "convert_adao" # Format des catalogues... # (code,version,catalogue,formatIn) et ,formatOut) ? self.catalogues = [] - self.catalogues.append(["DATASSIM", "V0", os.path.join(self.rep_ini, 'DATASSIM_Cata_V0.py'), "datassim"]) + self.catalogues.append(["ADAO", "V0", os.path.join(self.rep_ini, 'ADAO_Cata_V0.py'), "adao"]) def make_config(appli,rep): diff --git a/src/daEficas/convert_datassim.py b/src/daEficas/convert_adao.py similarity index 86% rename from src/daEficas/convert_datassim.py rename to src/daEficas/convert_adao.py index ea64a72..d2ff8e4 100644 --- a/src/daEficas/convert_datassim.py +++ b/src/daEficas/convert_adao.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -print "import convert_datassim" +print "import convert_adao" import convert.parseur_python from convert.convert_python import * @@ -11,7 +11,7 @@ def entryPoint(): """ return { # Le nom du plugin - 'name' : 'datassim', + 'name' : 'adao', # La factory pour créer une instance du plugin 'factory' : PythonParser, } diff --git a/src/daEficas/generator_datassim.py b/src/daEficas/generator_adao.py similarity index 94% rename from src/daEficas/generator_datassim.py rename to src/daEficas/generator_adao.py index 1520939..b23cf68 100644 --- a/src/daEficas/generator_datassim.py +++ b/src/daEficas/generator_adao.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -print "import generator_datassim" +print "import generator_adao" from generator.generator_python import PythonGenerator @@ -11,12 +11,12 @@ def entryPoint(): """ return { # Le nom du plugin - 'name' : 'datassim', + 'name' : 'adao', # La factory pour creer une instance du plugin - 'factory' : DatassimGenerator, + 'factory' : AdaoGenerator, } -class DatassimGenerator(PythonGenerator): +class AdaoGenerator(PythonGenerator): def __init__(self,cr=None): PythonGenerator.__init__(self, cr) @@ -26,7 +26,7 @@ class DatassimGenerator(PythonGenerator): self.text_da_status = False def gener(self,obj,format='brut',config=None): - print "DatassimGenerator gener" + print "AdaoGenerator gener" self.text_comm = PythonGenerator.gener(self, obj, format, config) print "Dictionnaire" @@ -43,7 +43,7 @@ class DatassimGenerator(PythonGenerator): def writeDefault(self, fn): if self.text_da_status: - print "write datassim python command file" + print "write adao python command file" filename = fn[:fn.rfind(".")] + '.py' f = open( str(filename), 'wb') f.write( self.text_da ) diff --git a/src/daEficas/prefs.py b/src/daEficas/prefs.py index 5f7de2f..b4c2182 100644 --- a/src/daEficas/prefs.py +++ b/src/daEficas/prefs.py @@ -1,2 +1,2 @@ # Fichier obligatoire ne devant que contenir la variable code... -code = "DATASSIM" +code = "ADAO" diff --git a/src/daEficas/prefs_ADAO.py.in b/src/daEficas/prefs_ADAO.py.in index 801e5fa..182b0f7 100644 --- a/src/daEficas/prefs_ADAO.py.in +++ b/src/daEficas/prefs_ADAO.py.in @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import os, sys -print "import des prefs de Datassim" +print "import des prefs de Adao" # Configuration de Eficas # INSTALLDIR, REPINI est obligatoire -- 2.39.2