X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FdaComposant%2FdaCore%2FInterfaces.py;h=d0f203983573bf9d827562136c29def895c72100;hb=638487104745d6366bb26a744fd1acc858770f03;hp=47164d8f42aad8cf4003a7b72467558c0163c401;hpb=fdfa4718d30e8aee85ade24f8296a9ad108fc6c9;p=modules%2Fadao.git diff --git a/src/daComposant/daCore/Interfaces.py b/src/daComposant/daCore/Interfaces.py index 47164d8..d0f2039 100644 --- a/src/daComposant/daCore/Interfaces.py +++ b/src/daComposant/daCore/Interfaces.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2008-2020 EDF R&D +# Copyright (C) 2008-2022 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 @@ -35,11 +35,12 @@ import copy from daCore import Persistence from daCore import PlatformInfo from daCore import Templates +from daCore import Reporting # ============================================================================== class GenericCaseViewer(object): """ - Gestion des commandes de creation d'une vue de cas + Gestion des commandes de création d'une vue de cas """ def __init__(self, __name="", __objname="case", __content=None, __object=None): "Initialisation et enregistrement de l'entete" @@ -51,16 +52,35 @@ class GenericCaseViewer(object): self._content = __content self._object = __object self._missing = """raise ValueError("This case requires beforehand to import or define the variable named <%s>. When corrected, remove this command, correct and uncomment the following one.")\n# """ + #------------------------ def _append(self, *args): - "Transformation de commande individuelle en enregistrement" + "Transformation d'une commande individuelle en un enregistrement" raise NotImplementedError() def _extract(self, *args): - "Transformation d'enregistrement en commande individuelle" + "Transformation d'enregistrement(s) en commande(s) individuelle(s)" raise NotImplementedError() + #------------------------------ + def _initialize(self, __multilines): + "Permet des pré-conversions automatiques simples de commandes ou clés" + __translation = { + "Study_name" :"StudyName", + "Study_repertory" :"StudyRepertory", + "MaximumNumberOfSteps":"MaximumNumberOfIterations", + "FunctionDict" :"ScriptWithSwitch", + "FUNCTIONDICT_FILE" :"SCRIPTWITHSWITCH_FILE", + } + for k,v in __translation.items(): + __multilines = __multilines.replace(k,v) + return __multilines def _finalize(self, __upa=None): "Enregistrement du final" - if __upa is not None and len(__upa)>0: + __hasNotExecute = True + for l in self._lineSerie: + if "%s.execute"%(self._objname,) in l: __hasNotExecute = False + if __hasNotExecute: self._lineSerie.append("%s.execute()"%(self._objname,)) + if __upa is not None and len(__upa)>0: + __upa = __upa.replace("ADD",str(self._objname)) self._lineSerie.append(__upa) def _addLine(self, line=""): "Ajoute un enregistrement individuel" @@ -82,8 +102,9 @@ class GenericCaseViewer(object): "Chargement normalisé des commandes" if __filename is not None and os.path.exists(__filename): self._content = open(__filename, 'r').read() + self._content = self._initialize(self._content) elif __content is not None and type(__content) is str: - self._content = __content + self._content = self._initialize(__content) elif __object is not None and type(__object) is dict: self._object = copy.deepcopy(__object) else: @@ -93,7 +114,7 @@ class GenericCaseViewer(object): class _TUIViewer(GenericCaseViewer): """ - Etablissement des commandes d'un cas ADAO TUI (Cas<->TUI) + Établissement des commandes d'un cas ADAO TUI (Cas<->TUI) """ def __init__(self, __name="", __objname="case", __content=None, __object=None): "Initialisation et enregistrement de l'entete" @@ -109,6 +130,8 @@ class _TUIViewer(GenericCaseViewer): def _append(self, __command=None, __keys=None, __local=None, __pre=None, __switchoff=False): "Transformation d'une commande individuelle en un enregistrement" if __command is not None and __keys is not None and __local is not None: + if "Concept" in __keys: + logging.debug("TUI Order processed: %s"%(__local["Concept"],)) __text = "" if __pre is not None: __text += "%s = "%__pre @@ -116,6 +139,7 @@ class _TUIViewer(GenericCaseViewer): if "self" in __keys: __keys.remove("self") if __command not in ("set","get") and "Concept" in __keys: __keys.remove("Concept") for k in __keys: + if k not in __local: continue __v = __local[k] if __v is None: continue if k == "Checked" and not __v: continue @@ -123,7 +147,7 @@ class _TUIViewer(GenericCaseViewer): if k == "ColMajor" and not __v: continue if k == "InputFunctionAsMulti" and not __v: continue if k == "nextStep" and not __v: continue - if k == "AvoidRC" and __v: continue + if k == "PerformanceProfile" and __v: continue if k == "noDetails": continue if isinstance(__v,Persistence.Persistence): __v = __v.values() if callable(__v): __text = self._missing%__v.__name__+__text @@ -133,11 +157,11 @@ class _TUIViewer(GenericCaseViewer): numpy.set_printoptions(precision=15,threshold=1000000,linewidth=1000*15) __text += "%s=%s, "%(k,repr(__v)) numpy.set_printoptions(precision=8,threshold=1000,linewidth=75) - __text.rstrip(", ") - __text += ")" + __text = __text.rstrip(", ") + __text += " )" self._addLine(__text) def _extract(self, __multilines="", __object=None): - "Transformation un enregistrement en une commande individuelle" + "Transformation d'enregistrement(s) en commande(s) individuelle(s)" __is_case = False __commands = [] __multilines = __multilines.replace("\r\n","\n") @@ -156,7 +180,7 @@ class _TUIViewer(GenericCaseViewer): class _COMViewer(GenericCaseViewer): """ - Etablissement des commandes d'un cas COMM (Eficas Native Format/Cas<-COM) + Établissement des commandes d'un cas COMM (Eficas Native Format/Cas<-COM) """ def __init__(self, __name="", __objname="case", __content=None, __object=None): "Initialisation et enregistrement de l'entete" @@ -171,10 +195,26 @@ class _COMViewer(GenericCaseViewer): for command in self._content: self._append(*command) def _extract(self, __multilines=None, __object=None): - "Transformation un enregistrement en une commande individuelle" + "Transformation d'enregistrement(s) en commande(s) individuelle(s)" + __suppparameters = {} if __multilines is not None: - __multilines = __multilines.replace("ASSIMILATION_STUDY","dict") - __multilines = __multilines.replace("CHECKING_STUDY", "dict") + if 'adaoBuilder' in __multilines: + raise ValueError("Impossible to load given content as an ADAO COMM one (Hint: it's perhaps not a COMM input, but a TUI one).") + if "ASSIMILATION_STUDY" in __multilines: + __suppparameters.update({'StudyType':"ASSIMILATION_STUDY"}) + __multilines = __multilines.replace("ASSIMILATION_STUDY","dict") + elif "OPTIMIZATION_STUDY" in __multilines: + __suppparameters.update({'StudyType':"ASSIMILATION_STUDY"}) + __multilines = __multilines.replace("OPTIMIZATION_STUDY", "dict") + elif "REDUCTION_STUDY" in __multilines: + __suppparameters.update({'StudyType':"ASSIMILATION_STUDY"}) + __multilines = __multilines.replace("REDUCTION_STUDY", "dict") + elif "CHECKING_STUDY" in __multilines: + __suppparameters.update({'StudyType':"CHECKING_STUDY"}) + __multilines = __multilines.replace("CHECKING_STUDY", "dict") + else: + __multilines = __multilines.replace("ASSIMILATION_STUDY","dict") + # __multilines = __multilines.replace("_F(", "dict(") __multilines = __multilines.replace(",),);", ",),)") __fulllines = "" @@ -199,18 +239,33 @@ class _COMViewer(GenericCaseViewer): __commands.append( "set( Concept='Name', String='%s')"%(str(r),) ) elif __command == "StudyRepertory": __commands.append( "set( Concept='Directory', String='%s')"%(str(r),) ) + elif __command == "Debug" and str(r) == "0": + __commands.append( "set( Concept='NoDebug' )" ) + elif __command == "Debug" and str(r) == "1": + __commands.append( "set( Concept='Debug' )" ) + elif __command == "ExecuteInContainer": + __suppparameters.update({'ExecuteInContainer':r}) # elif __command == "UserPostAnalysis" and type(r) is dict: if 'STRING' in r: - __UserPostAnalysis = r['STRING'] + __UserPostAnalysis = r['STRING'].replace("ADD",str(self._objname)) + __commands.append( "set( Concept='UserPostAnalysis', String=\"\"\"%s\"\"\" )"%(__UserPostAnalysis,) ) elif 'SCRIPT_FILE' in r and os.path.exists(r['SCRIPT_FILE']): __UserPostAnalysis = open(r['SCRIPT_FILE'],'r').read() - elif 'Template' in r and 'ValueTemplate' in r: + __commands.append( "set( Concept='UserPostAnalysis', Script='%s' )"%(r['SCRIPT_FILE'],) ) + elif 'Template' in r and not 'ValueTemplate' in r: # AnalysisPrinter... + if r['Template'] not in Templates.UserPostAnalysisTemplates: + raise ValueError("User post-analysis template \"%s\" does not exist."%(r['Template'],)) + else: + __UserPostAnalysis = Templates.UserPostAnalysisTemplates[r['Template']] + __commands.append( "set( Concept='UserPostAnalysis', Template='%s' )"%(r['Template'],) ) + elif 'Template' in r and 'ValueTemplate' in r: + # Le template ayant pu être modifié, donc on ne prend que le ValueTemplate... __UserPostAnalysis = r['ValueTemplate'] + __commands.append( "set( Concept='UserPostAnalysis', String=\"\"\"%s\"\"\" )"%(__UserPostAnalysis,) ) else: __UserPostAnalysis = "" - __UserPostAnalysis = __UserPostAnalysis.replace("ADD",self._objname) # elif __command == "AlgorithmParameters" and type(r) is dict and 'Algorithm' in r: if 'data' in r and r['Parameters'] == 'Dict': @@ -242,13 +297,13 @@ class _COMViewer(GenericCaseViewer): if __idata['NodeType'] == 'Template' and 'Template' in __idata: __template = __idata['Template'] if 'Info' in __idata: - __info = ", Info='%s'"%(__idata['Info'],) + __info = ", Info=\"\"\"%s\"\"\""%(__idata['Info'],) else: __info = "" - __commands.append( "set( Concept='Observer', Variable='%s', Template='%s'%s )"%(sk,__template,__info) ) + __commands.append( "set( Concept='Observer', Variable='%s', Template=\"\"\"%s\"\"\"%s )"%(sk,__template,__info) ) if __idata['NodeType'] == 'String' and 'Value' in __idata: __value =__idata['Value'] - __commands.append( "set( Concept='Observer', Variable='%s', String='%s' )"%(sk,__value) ) + __commands.append( "set( Concept='Observer', Variable='%s', String=\"\"\"%s\"\"\" )"%(sk,__value) ) # # Background, ObservationError, ObservationOperator... elif type(r) is dict: @@ -284,6 +339,8 @@ class _COMViewer(GenericCaseViewer): __arguments = ["%s = %s"%(k,repr(v)) for k,v in __argumentsList] __commands.append( "set( Concept='%s', %s )"%(__command, ", ".join(__arguments))) # + __commands.append( "set( Concept='%s', Parameters=%s )"%('SupplementaryParameters', repr(__suppparameters))) + # # ---------------------------------------------------------------------- __commands.sort() # Pour commencer par 'AlgorithmParameters' __commands.append(__UserPostAnalysis) @@ -291,20 +348,30 @@ class _COMViewer(GenericCaseViewer): class _SCDViewer(GenericCaseViewer): """ - Etablissement des commandes d'un cas SCD (Study Config Dictionary/Cas->SCD) + Établissement des commandes d'un cas SCD (Study Config Dictionary/Cas->SCD) + + Remarque : le fichier généré est différent de celui obtenu par EFICAS """ def __init__(self, __name="", __objname="case", __content=None, __object=None): - "Initialisation et enregistrement de l'entete" + "Initialisation et enregistrement de l'entête" GenericCaseViewer.__init__(self, __name, __objname, __content, __object) + # + if __content is not None: + for command in __content: + if command[0] == "set": __command = command[2]["Concept"] + else: __command = command[0].replace("set", "", 1) + if __command == 'Name': + self._name = command[2]["String"] + # + self.__DebugCommandNotSet = True + self.__ObserverCommandNotSet = True + self.__UserPostAnalysisNotSet = True + # self._addLine("# -*- coding: utf-8 -*-") - self._addLine("#\n# Input for ADAO converter to YACS\n#") - self._addLine("from numpy import array, matrix") + self._addLine("#\n# Input for ADAO converter to SCD\n#") self._addLine("#") self._addLine("study_config = {}") - self._addLine("study_config['StudyType'] = 'ASSIMILATION_STUDY'") self._addLine("study_config['Name'] = '%s'"%self._name) - self._addLine("observers = {}") - self._addLine("study_config['Observers'] = observers") self._addLine("#") self._addLine("inputvariables_config = {}") self._addLine("inputvariables_config['Order'] =['adao_default']") @@ -322,15 +389,24 @@ class _SCDViewer(GenericCaseViewer): "Transformation d'une commande individuelle en un enregistrement" if __command == "set": __command = __local["Concept"] else: __command = __command.replace("set", "", 1) + logging.debug("SCD Order processed: %s"%(__command)) # __text = None if __command in (None, 'execute', 'executePythonScheme', 'executeYACSScheme', 'get', 'Name'): return + elif __command in ['Directory',]: + __text = "#\nstudy_config['Repertory'] = %s"%(repr(__local['String'])) elif __command in ['Debug', 'setDebug']: __text = "#\nstudy_config['Debug'] = '1'" + self.__DebugCommandNotSet = False elif __command in ['NoDebug', 'setNoDebug']: __text = "#\nstudy_config['Debug'] = '0'" + self.__DebugCommandNotSet = False elif __command in ['Observer', 'setObserver']: + if self.__ObserverCommandNotSet: + self._addLine("observers = {}") + self._addLine("study_config['Observers'] = observers") + self.__ObserverCommandNotSet = False __obs = __local['Variable'] self._numobservers += 1 __text = "#\n" @@ -349,12 +425,28 @@ class _SCDViewer(GenericCaseViewer): else: __text += "observers['%s']['info'] = \"\"\"%s\"\"\"\n"%(__obs, __obs) __text += "observers['%s']['number'] = %s"%(__obs, self._numobservers) + elif __command in ['UserPostAnalysis', 'setUserPostAnalysis']: + __text = "#\n" + __text += "Analysis_config = {}\n" + if __local['String'] is not None: + __text += "Analysis_config['From'] = 'String'\n" + __text += "Analysis_config['Data'] = \"\"\"%s\"\"\"\n"%(__local['String'],) + if __local['Script'] is not None: + __text += "Analysis_config['From'] = 'Script'\n" + __text += "Analysis_config['Data'] = \"\"\"%s\"\"\"\n"%(__local['Script'],) + if __local['Template'] is not None and __local['Template'] in Templates.UserPostAnalysisTemplates: + __text += "Analysis_config['From'] = 'String'\n" + __text += "Analysis_config['Data'] = \"\"\"%s\"\"\"\n"%(Templates.UserPostAnalysisTemplates[__local['Template']],) + __text += "study_config['UserPostAnalysis'] = Analysis_config" + self.__UserPostAnalysisNotSet = False elif __local is not None: # __keys is not None and numpy.set_printoptions(precision=15,threshold=1000000,linewidth=1000*15) __text = "#\n" __text += "%s_config = {}\n"%__command __local.pop('self','') __to_be_removed = [] + __vectorIsDataFile = False + __vectorIsScript = False for __k,__v in __local.items(): if __v is None: __to_be_removed.append(__k) for __k in __to_be_removed: @@ -363,6 +455,7 @@ class _SCDViewer(GenericCaseViewer): if __k == "Concept": continue if __k in ['ScalarSparseMatrix','DiagonalSparseMatrix','Matrix','OneFunction','ThreeFunctions'] and 'Script' in __local and __local['Script'] is not None: continue if __k in ['Vector','VectorSerie'] and 'DataFile' in __local and __local['DataFile'] is not None: continue + if __k == 'Parameters' and not (__command in ['AlgorithmParameters','SupplementaryParameters']): continue if __k == 'Algorithm': __text += "study_config['Algorithm'] = %s\n"%(repr(__v)) elif __k == 'DataFile': @@ -375,6 +468,7 @@ class _SCDViewer(GenericCaseViewer): __text += "%s_config['From'] = '%s'\n"%(__command,__f) __text += "%s_config['Data'] = %s\n"%(__command,__v) __text = __text.replace("''","'") + __vectorIsDataFile = True elif __k == 'Script': __k = 'Vector' __f = 'Script' @@ -408,13 +502,16 @@ class _SCDViewer(GenericCaseViewer): __text += "%s_config['From'] = '%s'\n"%(__command,__f) __text += "%s_config['Data'] = %s\n"%(__command,__v) __text = __text.replace("''","'") + __vectorIsScript = True elif __k in ('Stored', 'Checked', 'ColMajor', 'InputFunctionAsMulti', 'nextStep'): if bool(__v): __text += "%s_config['%s'] = '%s'\n"%(__command,__k,int(bool(__v))) - elif __k in ('AvoidRC', 'noDetails'): + elif __k in ('PerformanceProfile', 'noDetails'): if not bool(__v): __text += "%s_config['%s'] = '%s'\n"%(__command,__k,int(bool(__v))) else: + if __k == 'Vector' and __vectorIsScript: continue + if __k == 'Vector' and __vectorIsDataFile: continue if __k == 'Parameters': __k = "Dict" if isinstance(__v,Persistence.Persistence): __v = __v.values() if callable(__v): __text = self._missing%__v.__name__+__text @@ -433,13 +530,16 @@ class _SCDViewer(GenericCaseViewer): self._switchoff = False def _finalize(self, *__args): self.__loadVariablesByScript() - self._addLine("#") - self._addLine("Analysis_config = {}") - self._addLine("Analysis_config['From'] = 'String'") - self._addLine("Analysis_config['Data'] = \"\"\"import numpy") - self._addLine("xa=numpy.ravel(ADD.get('Analysis')[-1])") - self._addLine("print('Analysis:',xa)\"\"\"") - self._addLine("study_config['UserPostAnalysis'] = Analysis_config") + if self.__DebugCommandNotSet: + self._addLine("#\nstudy_config['Debug'] = '0'") + if self.__UserPostAnalysisNotSet: + self._addLine("#") + self._addLine("Analysis_config = {}") + self._addLine("Analysis_config['From'] = 'String'") + self._addLine("Analysis_config['Data'] = \"\"\"import numpy") + self._addLine("xa=ADD.get('Analysis')[-1]") + self._addLine("print('Analysis:',xa)\"\"\"") + self._addLine("study_config['UserPostAnalysis'] = Analysis_config") def __loadVariablesByScript(self): __ExecVariables = {} # Necessaire pour recuperer la variable exec("\n".join(self._lineSerie), __ExecVariables) @@ -469,6 +569,20 @@ class _SCDViewer(GenericCaseViewer): __text += "AlgorithmParameters_config['From'] = 'String'\n" __text += "AlgorithmParameters_config['Data'] = '{}'\n" self._addLine(__text) + if 'SupplementaryParameters' in study_config and \ + isinstance(study_config['SupplementaryParameters'], dict) and \ + "From" in study_config['SupplementaryParameters'] and \ + study_config['SupplementaryParameters']["From"] == 'String' and \ + "Data" in study_config['SupplementaryParameters']: + __dict = eval(study_config['SupplementaryParameters']["Data"]) + if 'ExecuteInContainer' in __dict: + self._addLine("#\nstudy_config['ExecuteInContainer'] = '%s'"%__dict['ExecuteInContainer']) + else: + self._addLine("#\nstudy_config['ExecuteInContainer'] = 'No'") + if 'StudyType' in __dict: + self._addLine("#\nstudy_config['StudyType'] = '%s'"%__dict['StudyType']) + if 'StudyType' in __dict and __dict['StudyType'] != "ASSIMILATION_STUDY": + self.__UserPostAnalysisNotSet = False del study_config class _YACSViewer(GenericCaseViewer): @@ -493,8 +607,8 @@ class _YACSViewer(GenericCaseViewer): if not PlatformInfo.has_salome or \ not PlatformInfo.has_adao: raise ImportError( - "Unable to get SALOME or ADAO environnement variables for YACS conversion.\n"+\ - "Please load the right environnement before trying to use it.") + "Unable to get SALOME or ADAO environnement for YACS conversion.\n"+\ + "Please load the right SALOME environnement before trying to use it.") else: from daYacsSchemaCreator.run import create_schema_from_content # ----- @@ -514,6 +628,76 @@ class _YACSViewer(GenericCaseViewer): __fid.close() return __text +# ============================================================================== +class _ReportViewer(GenericCaseViewer): + """ + Partie commune de restitution simple + """ + def __init__(self, __name="", __objname="case", __content=None, __object=None): + "Initialisation et enregistrement de l'entete" + GenericCaseViewer.__init__(self, __name, __objname, __content, __object) + self._r = Reporting.ReportStorage() + self._r.clear() + if self._name == "": + self._r.append("ADAO Study report", "title") + else: + self._r.append(str(self._name), "title") + if self._content is not None: + for command in self._content: + self._append(*command) + def _append(self, __command=None, __keys=None, __local=None, __pre=None, __switchoff=False): + "Transformation d'une commande individuelle en un enregistrement" + if __command is not None and __keys is not None and __local is not None: + if __command in ("set","get") and "Concept" in __keys: __command = __local["Concept"] + __text = "" + __text += "%s command has been set"%str(__command.replace("set","")) + __ktext = "" + for k in __keys: + if k not in __local: continue + __v = __local[k] + if __v is None: continue + if k == "Checked" and not __v: continue + if k == "Stored" and not __v: continue + if k == "ColMajor" and not __v: continue + if k == "InputFunctionAsMulti" and not __v: continue + if k == "nextStep" and not __v: continue + if k == "PerformanceProfile" and __v: continue + if k == "noDetails": continue + if k == "Concept": continue + if k == "self": continue + if isinstance(__v,Persistence.Persistence): __v = __v.values() + numpy.set_printoptions(precision=15,threshold=1000000,linewidth=1000*15) + __ktext += "\n %s = %s,"%(k,repr(__v)) + numpy.set_printoptions(precision=8,threshold=1000,linewidth=75) + if len(__ktext) > 0: + __text += " with values:" + __ktext + __text = __text.rstrip(", ") + self._r.append(__text, "uli") + def _finalize(self, __upa=None): + "Enregistrement du final" + raise NotImplementedError() + +class _SimpleReportInRstViewer(_ReportViewer): + """ + Restitution simple en RST + """ + def _finalize(self, __upa=None): + self._lineSerie.append(Reporting.ReportViewInRst(self._r).__str__()) + +class _SimpleReportInHtmlViewer(_ReportViewer): + """ + Restitution simple en HTML + """ + def _finalize(self, __upa=None): + self._lineSerie.append(Reporting.ReportViewInHtml(self._r).__str__()) + +class _SimpleReportInPlainTxtViewer(_ReportViewer): + """ + Restitution simple en TXT + """ + def _finalize(self, __upa=None): + self._lineSerie.append(Reporting.ReportViewInPlainTxt(self._r).__str__()) + # ============================================================================== class ImportFromScript(object): """ @@ -533,8 +717,12 @@ class ImportFromScript(object): __basename = __filename.rstrip(".py") PlatformInfo.checkFileNameImportability( __basename+".py" ) self.__basename = __basename - self.__filenspace = __import__(__basename, globals(), locals(), []) - self.__filestring = open(__filename,'r').read() + try: + self.__filenspace = __import__(__basename, globals(), locals(), []) + except NameError: + self.__filenspace = "" + with open(__filename,'r') as fid: + self.__filestring = fid.read() def getvalue(self, __varname=None, __synonym=None ): "Renvoie la variable demandee par son nom ou son synonyme" if __varname is None: @@ -591,12 +779,9 @@ class ImportDetector(object): else: return False def is_not_local_file(self): - if not os.path.isfile(os.path.realpath(self.__url)): - return True - else: - return False + return not self.is_local_file() def raise_error_if_not_local_file(self): - if not os.path.isfile(os.path.realpath(self.__url)): + if self.is_not_local_file(): raise ValueError("The name or the url of the file object doesn't seem to exist. The given name is:\n \"%s\""%str(self.__url)) else: return False @@ -609,12 +794,9 @@ class ImportDetector(object): else: return False def is_not_local_dir(self): - if not os.path.isdir(self.__url): - return True - else: - return False + return not self.is_local_dir() def raise_error_if_not_local_dir(self): - if not os.path.isdir(self.__url): + if self.is_not_local_dir(): raise ValueError("The name or the url of the directory object doesn't seem to exist. The given name is:\n \"%s\""%str(self.__url)) else: return False @@ -729,7 +911,7 @@ class ImportFromFile(object): __header.append(__line) __skiprows += 1 __line = fid.readline().strip() - __varsline = __line + __varsline = __line # Ligne de labels par convention for i in range(max(0,__nblines)): __header.append(fid.readline()) return (__header, __varsline, __skiprows) @@ -777,7 +959,7 @@ class ImportFromFile(object): return self.__supportedformats def getvalue(self, ColNames=None, ColIndex=None ): - "Renvoie la ou les variables demandees par la liste de leurs noms" + "Renvoie la ou les variables demandées par la liste de leurs noms" # Uniquement si mise à jour if ColNames is not None: self._colnames = tuple(ColNames) if ColIndex is not None: self._colindex = str(ColIndex) @@ -888,7 +1070,7 @@ class ImportScalarLinesFromFile(ImportFromFile): raise ValueError("Unkown file format \"%s\""%self._format) # def getvalue(self, VarNames = None, HeaderNames=()): - "Renvoie la ou les variables demandees par la liste de leurs noms" + "Renvoie la ou les variables demandées par la liste de leurs noms" if VarNames is not None: __varnames = tuple(VarNames) else: __varnames = None # @@ -922,7 +1104,7 @@ class ImportScalarLinesFromFile(ImportFromFile): for i in range(1,len(HeaderNames)): __converters[i] = __replaceNone else: - raise ValueError("Can not find names of columns for initial values. Wrong first line is:\n \"%s\""%__firstline) + raise ValueError("Can not find names of columns for initial values. Wrong first line is:\n \"%s\""%self._varsline) # if self._format == "text/plain": __content = numpy.loadtxt(self._filename, dtype = __dtypes, usecols = __usecols, skiprows = self._skiprows, converters = __converters) @@ -975,6 +1157,9 @@ class EficasGUI(object): if "EFICAS_ROOT" in os.environ: __EFICAS_ROOT = os.environ["EFICAS_ROOT"] __path_ok = True + elif "EFICAS_NOUVEAU_ROOT" in os.environ: + __EFICAS_ROOT = os.environ["EFICAS_NOUVEAU_ROOT"] + __path_ok = True else: self.__msg += "\nKeyError:\n"+\ " the required environment variable EFICAS_ROOT is unknown.\n"+\