From: Pascale Noyret Date: Fri, 9 Nov 2007 15:12:18 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V1_13b1~29 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a3b368a287ed04f4e6cbf2ebc95713090a41aa68;p=modules%2Feficas.git *** empty log message *** --- diff --git a/InterfaceQT/monFormulePanel.py b/InterfaceQT/monFormulePanel.py index 7f3ba74c..e3af126d 100644 --- a/InterfaceQT/monFormulePanel.py +++ b/InterfaceQT/monFormulePanel.py @@ -132,8 +132,11 @@ class MonFormulePanel(DFormule,QTPanelTBW2): test=self.node.item.object.update_formule_python(formule=(nomFormule,"REEL",arguments,expression)) test,erreur = self.node.item.save_formule(nomFormule,"REEL",arguments,expression) if test : + #self.node.update_texte() + #self.node.update_label() + #self.node.update_node() + self.node.onValid() self.node.update_valid() - self.node.update_node_texte() commentaire = "Formule modifiée" else: commentaire ="Formule incorrecte : " + erreur diff --git a/InterfaceQT/monRacinePanel.py b/InterfaceQT/monRacinePanel.py index 1a4abb9b..f1c3a223 100644 --- a/InterfaceQT/monRacinePanel.py +++ b/InterfaceQT/monRacinePanel.py @@ -45,7 +45,7 @@ class MonRacinePanel(DRac,QTPanelTBW2): QTPanel.BSupPressed(self) def BOkPressed(self): - QTPanel.BOkPressed(self) + self.DefCmd() def BNextPressed(self): QTPanelTBW2.BNextPressed(self) diff --git a/Ui/desPoursuite.py b/Ui/desPoursuite.py new file mode 100644 index 00000000..7d46ed4c --- /dev/null +++ b/Ui/desPoursuite.py @@ -0,0 +1,206 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'desPoursuite.ui' +# +# Created: lun oct 29 16:17:08 2007 +# by: The PyQt User Interface Compiler (pyuic) 3.13 +# +# WARNING! All changes made in this file will be lost! + + +from qt import * + +image0_data = \ + "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \ + "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \ + "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \ + "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \ + "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \ + "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \ + "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \ + "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \ + "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \ + "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \ + "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \ + "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \ + "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \ + "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \ + "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \ + "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \ + "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \ + "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \ + "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \ + "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \ + "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \ + "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82" + +class DPour(QWidget): + def __init__(self,parent = None,name = None,fl = 0): + QWidget.__init__(self,parent,name,fl) + + self.image0 = QPixmap() + self.image0.loadFromData(image0_data,"PNG") + if not name: + self.setName("DPour") + + self.setMinimumSize(QSize(505,0)) + + + self.Commentaire = QLabel(self,"Commentaire") + self.Commentaire.setGeometry(QRect(10,410,490,20)) + + self.bSup = QPushButton(self,"bSup") + self.bSup.setGeometry(QRect(320,440,142,30)) + self.bSup.setAutoDefault(1) + + self.bOk = QPushButton(self,"bOk") + self.bOk.setGeometry(QRect(170,440,142,30)) + self.bOk.setAutoDefault(1) + self.bOk.setDefault(1) + + self.bHelp = QPushButton(self,"bHelp") + self.bHelp.setGeometry(QRect(10,440,142,30)) + self.bHelp.setAutoDefault(1) + + self.TWChoix = QTabWidget(self,"TWChoix") + self.TWChoix.setGeometry(QRect(0,0,500,400)) + + self.MotClef = QWidget(self.TWChoix,"MotClef") + + self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2") + self.textLabel1_2.setGeometry(QRect(360,0,50,37)) + + self.LBMCPermis = QListBox(self.MotClef,"LBMCPermis") + self.LBMCPermis.setGeometry(QRect(10,40,220,290)) + self.LBMCPermis.setMinimumSize(QSize(0,0)) + + self.LBRegles = QListBox(self.MotClef,"LBRegles") + self.LBRegles.setGeometry(QRect(260,40,230,290)) + + self.textLabel1 = QLabel(self.MotClef,"textLabel1") + self.textLabel1.setGeometry(QRect(50,10,120,20)) + self.textLabel1.setMinimumSize(QSize(0,0)) + self.TWChoix.insertTab(self.MotClef,QString("")) + + self.Commande = QWidget(self.TWChoix,"Commande") + + self.textLabel6 = QLabel(self.Commande,"textLabel6") + self.textLabel6.setGeometry(QRect(10,60,60,30)) + + self.textLabel4 = QLabel(self.Commande,"textLabel4") + self.textLabel4.setGeometry(QRect(90,340,300,30)) + + self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande") + self.LBNouvCommande.setGeometry(QRect(50,100,410,240)) + + self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1") + self.buttonGroup1.setGeometry(QRect(300,20,151,70)) + + self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe") + self.RBGroupe.setGeometry(QRect(20,40,101,20)) + + self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha") + self.RBalpha.setGeometry(QRect(20,20,101,20)) + self.RBalpha.setChecked(1) + + self.LEFiltre = QLineEdit(self.Commande,"LEFiltre") + self.LEFiltre.setGeometry(QRect(50,60,160,30)) + + self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4") + self.textLabel1_4.setGeometry(QRect(50,20,171,21)) + + self.BNext = QToolButton(self.Commande,"BNext") + self.BNext.setGeometry(QRect(220,60,30,31)) + self.BNext.setIconSet(QIconSet(self.image0)) + self.TWChoix.insertTab(self.Commande,QString("")) + + self.TabPage = QWidget(self.TWChoix,"TabPage") + + self.BBrowse = QPushButton(self.TabPage,"BBrowse") + self.BBrowse.setGeometry(QRect(288,306,161,41)) + + self.textLabel1_3 = QLabel(self.TabPage,"textLabel1_3") + self.textLabel1_3.setGeometry(QRect(70,50,350,41)) + + self.LENomFichier = QLineEdit(self.TabPage,"LENomFichier") + self.LENomFichier.setGeometry(QRect(18,127,450,30)) + self.TWChoix.insertTab(self.TabPage,QString("")) + + self.languageChange() + + self.resize(QSize(521,499).expandedTo(self.minimumSizeHint())) + self.clearWState(Qt.WState_Polished) + + self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked) + self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged) + self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed) + self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed) + self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed) + self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand) + self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand) + self.connect(self.BNext,SIGNAL("clicked()"),self.BNextPressed) + self.connect(self.BBrowse,SIGNAL("clicked()"),self.BBrowsePressed) + self.connect(self.LENomFichier,SIGNAL("returnPressed()"),self.LENomFichReturnPressed) + + + def languageChange(self): + self.setCaption(self.__tr("DMacro")) + self.Commentaire.setText(QString.null) + self.bSup.setText(self.__tr("&Supprimer")) + self.bSup.setAccel(self.__tr("Alt+S")) + QToolTip.add(self.bSup,self.__tr("suppression du mot clef")) + self.bOk.setText(self.__tr("&Valider")) + self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A")) + QToolTip.add(self.bOk,self.__tr("validation de la saisie")) + self.bHelp.setText(self.__tr("&Documentation")) + self.bHelp.setAccel(self.__tr("Alt+D")) + QToolTip.add(self.bHelp,self.__tr("affichage documentation aster")) + self.textLabel1_2.setText(self.__trUtf8("\x3c\x68\x33\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x3c\x75\x3e\x3c\x62\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x3c\x2f\x62\x3e\x3c\x2f\x75\x3e\x3c\x2f\x70\x3e\x3c\x2f\x68\x33\x3e")) + self.textLabel1.setText(self.__tr("

Mots Clefs Permis

")) + self.TWChoix.changeTab(self.MotClef,self.__tr("Ajouter Mot-Clef")) + self.textLabel6.setText(self.__tr("Filtre")) + self.textLabel4.setText(self.__trUtf8("\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65")) + self.buttonGroup1.setTitle(self.__tr("Affichage")) + self.RBGroupe.setText(self.__tr("par groupe")) + self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65")) + self.textLabel1_4.setText(self.__tr("Commandes :")) + self.BNext.setText(QString.null) + QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence")) + self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande")) + self.BBrowse.setText(self.__tr("Edit")) + self.textLabel1_3.setText(self.__tr("La commande POURSUITE requiert un nom de Fichier :")) + self.TWChoix.changeTab(self.TabPage,self.__tr("Fichier Poursuite")) + + + def LBNouvCommandeClicked(self): + print "DPour.LBNouvCommandeClicked(): Not implemented yet" + + def LEFiltreTextChanged(self): + print "DPour.LEFiltreTextChanged(): Not implemented yet" + + def LEfiltreReturnPressed(self): + print "DPour.LEfiltreReturnPressed(): Not implemented yet" + + def BSupPressed(self): + print "DPour.BSupPressed(): Not implemented yet" + + def BOkPressed(self): + print "DPour.BOkPressed(): Not implemented yet" + + def BuildTabCommand(self): + print "DPour.BuildTabCommand(): Not implemented yet" + + def BNextPressed(self): + print "DPour.BNextPressed(): Not implemented yet" + + def BBrowsePressed(self): + print "DPour.BBrowsePressed(): Not implemented yet" + + def LENomFichReturnPressed(self): + print "DPour.LENomFichReturnPressed(): Not implemented yet" + + def __tr(self,s,c = None): + return qApp.translate("DPour",s,c) + + def __trUtf8(self,s,c = None): + return qApp.translate("DPour",s,c,QApplication.UnicodeUTF8) diff --git a/Ui/desPoursuite.ui b/Ui/desPoursuite.ui new file mode 100644 index 00000000..a06acd01 --- /dev/null +++ b/Ui/desPoursuite.ui @@ -0,0 +1,497 @@ + +DPour + + + DPour + + + + 0 + 0 + 521 + 499 + + + + + 505 + 0 + + + + DMacro + + + + Commentaire + + + + 10 + 410 + 490 + 20 + + + + + + + + + bSup + + + + 320 + 440 + 142 + 30 + + + + &Supprimer + + + Alt+S + + + true + + + suppression du mot clef + + + + + bOk + + + + 170 + 440 + 142 + 30 + + + + &Valider + + + Shift+A, Alt+A, Alt+A, Alt+A + + + true + + + true + + + validation de la saisie + + + + + bHelp + + + + 10 + 440 + 142 + 30 + + + + &Documentation + + + Alt+D + + + true + + + affichage documentation aster + + + + + TWChoix + + + + 0 + 0 + 500 + 400 + + + + + MotClef + + + Ajouter Mot-Clef + + + + textLabel1_2 + + + + 360 + 0 + 50 + 37 + + + + <h3><p align="center"><u><b>Régles</b></u></p></h3> + + + + + LBMCPermis + + + + 10 + 40 + 220 + 290 + + + + + 0 + 0 + + + + + + LBRegles + + + + 260 + 40 + 230 + 290 + + + + + + textLabel1 + + + + 50 + 10 + 120 + 20 + + + + + 0 + 0 + + + + <h3><p align="center"><u><b>Mots Clefs Permis</b></u></p></h3> + + + + + + Commande + + + Nouvelle Commande + + + + textLabel6 + + + + 10 + 60 + 60 + 30 + + + + Filtre + + + + + textLabel4 + + + + 90 + 340 + 300 + 30 + + + + La commande choisie sera ajoutée APRES la commande courante + + + + + LBNouvCommande + + + + 50 + 100 + 410 + 240 + + + + + + buttonGroup1 + + + + 300 + 20 + 151 + 70 + + + + Affichage + + + + RBGroupe + + + + 20 + 40 + 101 + 20 + + + + par groupe + + + + + RBalpha + + + + 20 + 20 + 101 + 20 + + + + alphabétique + + + true + + + + + + LEFiltre + + + + 50 + 60 + 160 + 30 + + + + + + textLabel1_4 + + + + 50 + 20 + 171 + 21 + + + + <b><u>Commandes :</u></b> + + + + + BNext + + + + 220 + 60 + 30 + 31 + + + + + + + image0 + + + affiche la prochaine occurence + + + + + + TabPage + + + Fichier Poursuite + + + + BBrowse + + + + 288 + 306 + 161 + 41 + + + + Edit + + + + + textLabel1_3 + + + + 70 + 50 + 350 + 41 + + + + <font size="+1">La commande POURSUITE requiert un nom de Fichier :</font> + + + + + LENomFichier + + + + 18 + 127 + 450 + 30 + + + + + + + + + 89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082 + + + + + LBNouvCommande + clicked(QListBoxItem*) + DPour + LBNouvCommandeClicked() + + + LEFiltre + textChanged(const QString&) + DPour + LEFiltreTextChanged() + + + LEFiltre + returnPressed() + DPour + LEfiltreReturnPressed() + + + bSup + pressed() + DPour + BSupPressed() + + + bOk + clicked() + DPour + BOkPressed() + + + RBalpha + clicked() + DPour + BuildTabCommand() + + + RBGroupe + clicked() + DPour + BuildTabCommand() + + + BNext + clicked() + DPour + BNextPressed() + + + BBrowse + clicked() + DPour + BBrowsePressed() + + + LENomFichier + returnPressed() + DPour + LENomFichReturnPressed() + + + + LBNouvCommandeClicked() + LEFiltreTextChanged() + LEfiltreReturnPressed() + BSupPressed() + BOkPressed() + BuildTabCommand() + BNextPressed() + BBrowsePressed() + LENomFichReturnPressed() + + +