From: Pascale Noyret Date: Thu, 10 Jun 2010 12:15:15 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V2_0_2_Aster X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9b49ec7c0cc2d261d6716715745dfa2f1bc770e4;p=modules%2Feficas.git *** empty log message *** --- diff --git a/CMakeLists.txt b/CMakeLists.txt index d0b3f875..afbe5333 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,7 @@ set ( _OPTIONLIST WITH_ASTER WITH_MAP WITH_SEP + WITH_TK WITH_SALOME_MECA ) @@ -159,8 +160,14 @@ endif (WITH_OPENTURNS) # Installation des fichiers : Aster if (WITH_ASTER) add_subdirectory ( Aster ) + add_subdirectory ( Traducteur ) endif (WITH_ASTER) +if (WITH_TK) + add_subdirectory ( InterfaceTK ) + add_subdirectory ( Pmw ) +endif (WITH_TK) + # Installation des fichiers : MAP if (WITH_MAP) add_subdirectory ( Map ) diff --git a/InterfaceQT4/compomclist.py b/InterfaceQT4/compomclist.py index 029d73dc..dbc71ca0 100644 --- a/InterfaceQT4/compomclist.py +++ b/InterfaceQT4/compomclist.py @@ -147,6 +147,7 @@ class MCListTreeItem(Objecttreeitem.SequenceTreeItem,compofact.FACTTreeItem): def get_docu(self): """ Retourne la clef de doc de l'objet pointé par self """ + print "hhhhhhhhhhhh" return self.object.get_docu() def iscopiable(self): diff --git a/InterfaceQT4/gereTraduction.py b/InterfaceQT4/gereTraduction.py index d7500886..c93edcb0 100644 --- a/InterfaceQT4/gereTraduction.py +++ b/InterfaceQT4/gereTraduction.py @@ -11,15 +11,12 @@ def traduction(directPath,editor,version): if version == "V8V9" : from Traducteur import traduitV8V9 suffixe="v9.comm" - print "hhhhhhhhhhhhhhhhhhhhhhhhhhhh" fn = QFileDialog.getOpenFileName( editor.appliEficas, editor.appliEficas.trUtf8('Traduire Fichier'), QString(directPath) , editor.appliEficas.trUtf8('JDC Files (*.comm);;''All Files (*)')) - print "hhhhhhhhhhhhhhhhhhhhhhhhhhhh" - print fn FichieraTraduire=str(fn) if (FichieraTraduire == "" or FichieraTraduire == () ) : return i=FichieraTraduire.rfind(".") diff --git a/InterfaceQT4/monPoursuitePanel.py b/InterfaceQT4/monPoursuitePanel.py index bd5aa306..94a72e61 100644 --- a/InterfaceQT4/monPoursuitePanel.py +++ b/InterfaceQT4/monPoursuitePanel.py @@ -75,7 +75,6 @@ class MonPoursuitePanel(MonMacroPanel): self.BBrowse.setMinimumSize(QtCore.QSize(140, 50)) self.BBrowse.setObjectName("BBrowse") self.TWChoix.addTab(self.TabPage, "") - self.gridlayout.addWidget(self.TWChoix, 0, 0, 1, 3) self.BFichier.setText(QtGui.QApplication.translate("DPour", "Autre Fichier", None, QtGui.QApplication.UnicodeUTF8)) self.BBrowse.setText(QtGui.QApplication.translate("DPour", "Edit", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py index c1827f9e..ab9fe572 100644 --- a/InterfaceQT4/qtEficas.py +++ b/InterfaceQT4/qtEficas.py @@ -20,6 +20,7 @@ class Appli(Ui_Eficas,QMainWindow): Constructor """ self.VERSION_EFICAS="Eficas QT4 V2.0" + self.ihm="QT" self.code=code self.ssCode=ssCode @@ -30,6 +31,7 @@ class Appli(Ui_Eficas,QMainWindow): self.dict_reels={} import prefs + #print prefs prefs.code=code name='prefs_'+prefs.code prefsCode=__import__(name) @@ -46,7 +48,6 @@ class Appli(Ui_Eficas,QMainWindow): import sys nameConf='configuration_'+prefs.code configuration=__import__(nameConf) - self.CONFIGURATION = configuration.make_config(self,prefsCode.REPINI) self.CONFIGStyle = configuration.make_config_style(self,prefsCode.REPINI) if hasattr(prefsCode,'encoding'): @@ -259,11 +260,11 @@ class Appli(Ui_Eficas,QMainWindow): def traductionV7V8(self): from gereTraduction import traduction - traduction(self.CONFIGURATION.rep_user,self.viewmanager,"V7V8") + traduction(self.CONFIGURATION.rep_ini,self.viewmanager,"V7V8") def traductionV8V9(self): from gereTraduction import traduction - traduction(self.CONFIGURATION.rep_user,self.viewmanager,"V8V9") + traduction(self.CONFIGURATION.rep_ini,self.viewmanager,"V8V9") def version(self) : from monVisu import DVisu diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py index 114a48d8..4207cd04 100644 --- a/InterfaceQT4/readercata.py +++ b/InterfaceQT4/readercata.py @@ -260,9 +260,10 @@ class READERCATA: def traite_clefs_documentaires(self): try: self.fic_cata_clef=os.path.splitext(self.fic_cata_c)[0]+'_clefs_docu' + #print self.fic_cata_clef f=open(self.fic_cata_clef) except: - #print "Pas de fichier associe contenant des clefs documentaires" + print "Pas de fichier associe contenant des clefs documentaires" return dict_clef_docu={} diff --git a/InterfaceTK/CMakeLists.txt b/InterfaceTK/CMakeLists.txt new file mode 100644 index 00000000..ebc018e5 --- /dev/null +++ b/InterfaceTK/CMakeLists.txt @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# CONFIGURATION MANAGEMENT OF EDF VERSION +# ====================================================================== +# COPYRIGHT (C) 1991 - 2002 EDF R&D WWW.CODE-ASTER.ORG +# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY +# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY +# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR +# (AT YOUR OPTION) ANY LATER VERSION. +# +# THIS PROGRAM 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 +# GENERAL PUBLIC LICENSE FOR MORE DETAILS. +# +# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE +# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER, +# 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. +# +# +# ====================================================================== + +# Installation de tous les fichiers Python, texte et images du repertoire et des sous-repertoires (sauf CVS) +install ( + FILES + appli.py basestyle.py browser.py bureau.py catabrowser.py + cataediteur.py centerwindow.py change_comm.py compobase.py + compobloc.py compocommandecomm.py compocomm.py compoerror.py + compofact.py compoformule.py compojdc.py compomacro.py + compomclist.py componiveau.py componuplet.py compooper.py + compoparameval.py compoparam.py compoproc.py composimp.py + definition_cata.py eficas_go.py eficas.py eficas_test.py + faq.py fenetre_mc_inconnus.py fonctionpanel.py fontes.py + images.py __init__.py Interp.py jdcdisplay.py + listeFichiers.py listePatronsTK.py macrodisplay.py menubar.py + newsimppanel.py options.py panels.py panelsSalome.py + patches.py plusieursassdpanel.py plusieursbasepanel.py + plusieursintopanel.py plusieurspanel.py readercata.py + shellpanel.py splash.py statusbar.py styles.py + toolbar.py tooltip.py treeitemincanvas.py treewidget.py + TroisDPal.py uniqueassdpanel.py uniquebasepanel.py + uniquecomppanel.py uniqueintopanel.py + uniquepanel.py uniquesdcopanel.py widgets.py + DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceTK + ) + +### Local Variables: +### mode: cmake +### End: diff --git a/Pmw/CMakeLists.txt b/Pmw/CMakeLists.txt new file mode 100644 index 00000000..e59468d7 --- /dev/null +++ b/Pmw/CMakeLists.txt @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# CONFIGURATION MANAGEMENT OF EDF VERSION +# ====================================================================== +# COPYRIGHT (C) 1991 - 2002 EDF R&D WWW.CODE-ASTER.ORG +# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY +# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY +# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR +# (AT YOUR OPTION) ANY LATER VERSION. +# +# THIS PROGRAM 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 +# GENERAL PUBLIC LICENSE FOR MORE DETAILS. +# +# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE +# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER, +# 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. +# +# +# ====================================================================== + +# Installation de tous les fichiers Python, texte et images du repertoire et des sous-repertoires (sauf CVS) +install ( + FILES + __init__.py + DESTINATION ${CMAKE_INSTALL_PREFIX}/Pmw + ) +add_subdirectory (Pmw_1_2) + +### Local Variables: +### mode: cmake +### End: diff --git a/Pmw/Pmw_1_2/CMakeLists.txt b/Pmw/Pmw_1_2/CMakeLists.txt new file mode 100644 index 00000000..d61f5446 --- /dev/null +++ b/Pmw/Pmw_1_2/CMakeLists.txt @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# CONFIGURATION MANAGEMENT OF EDF VERSION +# ====================================================================== +# COPYRIGHT (C) 1991 - 2002 EDF R&D WWW.CODE-ASTER.ORG +# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY +# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY +# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR +# (AT YOUR OPTION) ANY LATER VERSION. +# +# THIS PROGRAM 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 +# GENERAL PUBLIC LICENSE FOR MORE DETAILS. +# +# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE +# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER, +# 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. +# +# +# ====================================================================== + +# Installation de tous les fichiers Python, texte et images du repertoire et des sous-repertoires (sauf CVS) +install ( + FILES + __init__.py + DESTINATION ${CMAKE_INSTALL_PREFIX}/Pmw/Pmw_1_2 + ) +install ( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin + ${CMAKE_CURRENT_SOURCE_DIR}/contrib + ${CMAKE_CURRENT_SOURCE_DIR}/demos + ${CMAKE_CURRENT_SOURCE_DIR}/doc + ${CMAKE_CURRENT_SOURCE_DIR}/lib + ${CMAKE_CURRENT_SOURCE_DIR}/tests + DESTINATION ${CMAKE_INSTALL_PREFIX}/Pmw/Pmw_1_2 +) + + +### Local Variables: +### mode: cmake +### End: diff --git a/generator/generator_map.py b/generator/generator_map.py index e8e00268..a6fd4e2f 100644 --- a/generator/generator_map.py +++ b/generator/generator_map.py @@ -59,6 +59,7 @@ class MapGenerator(PythonGenerator): self.listeCODE=[] self.text="" self.textCode="" + self.texteExecution="" def verifie(self): print 'verification generique' diff --git a/generator/generator_python.py b/generator/generator_python.py index 93f6749d..6d178dca 100644 --- a/generator/generator_python.py +++ b/generator/generator_python.py @@ -153,7 +153,7 @@ class PythonGenerator: elif isinstance(obj,Formula): return self.generFormula(obj) else: - raise "Type d'objet non prévu",obj + raise "Type d'objet non prevu",obj def generJDC(self,obj): """