X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGUI_PY%2Fselectvars.py;h=38ff62b125a023d70340f3c82b9c6aee3b298730;hb=refs%2Ftags%2FV9_11_0;hp=95a4664371535c1831036ce7e74d0d61dfbfcf54;hpb=26ac7ca874ce9a796ff7ad43685f42afca635df9;p=modules%2Fgui.git diff --git a/src/GUI_PY/selectvars.py b/src/GUI_PY/selectvars.py index 95a466437..38ff62b12 100644 --- a/src/GUI_PY/selectvars.py +++ b/src/GUI_PY/selectvars.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -21,8 +21,8 @@ # import os -from PyQt4 import QtGui, QtCore -from PyQt4.QtCore import Qt + +from qtsalome import * import salome from salome.kernel.studyedit import getStudyEditor @@ -34,23 +34,23 @@ from salome.kernel.parametric import study_exchange_vars from SelectVarsDialog_ui import Ui_SelectVarsDialog -class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog): +class MySelectVarsDialog(Ui_SelectVarsDialog, QDialog): def __init__(self, parent = None, modal = 0): - QtGui.QDialog.__init__(self, parent) + QDialog.__init__(self, parent) Ui_SelectVarsDialog.__init__(self) self.setupUi(self) - self.connect(self.cancelButton, QtCore.SIGNAL("clicked()"), self.close) - self.connect(self.OKButton, QtCore.SIGNAL("clicked()"), self.accept) - self.connect(self.selectButton, QtCore.SIGNAL("clicked()"), self.initPotentialVariablesFromSelection) - self.connect(self.addInputVarButton, QtCore.SIGNAL("clicked()"), self.addSelectedInputVar) - self.connect(self.removeInputVarButton, QtCore.SIGNAL("clicked()"), self.removeSelectedInputVar) - self.connect(self.newInputVarButton, QtCore.SIGNAL("clicked()"), self.newInputVar) - self.connect(self.addOutputVarButton, QtCore.SIGNAL("clicked()"), self.addSelectedOutputVar) - self.connect(self.removeOutputVarButton, QtCore.SIGNAL("clicked()"), self.removeSelectedOutputVar) - self.connect(self.newOutputVarButton, QtCore.SIGNAL("clicked()"), self.newOutputVar) - self.connect(self.loadVarsButton, QtCore.SIGNAL("clicked()"), self.loadVars) - self.connect(self.saveVarsButton, QtCore.SIGNAL("clicked()"), self.saveVars) + self.cancelButton.clicked.connect(self.close) + self.OKButton.clicked.connect(self.accept) + self.selectButton.clicked.connect(self.initPotentialVariablesFromSelection) + self.addInputVarButton.clicked.connect(self.addSelectedInputVar) + self.removeInputVarButton.clicked.connect(self.removeSelectedInputVar) + self.newInputVarButton.clicked.connect(self.newInputVar) + self.addOutputVarButton.clicked.connect(self.addSelectedOutputVar) + self.removeOutputVarButton.clicked.connect(self.removeSelectedOutputVar) + self.newOutputVarButton.clicked.connect( self.newOutputVar) + self.loadVarsButton.clicked.connect(self.loadVars) + self.saveVarsButtonself.clicked.connect(self.saveVars) self.refEntry = None def setExchangeVariables(self, exchangeVariables): @@ -62,8 +62,8 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog): def initPotentialVariablesFromSelection(self): entries = salome.sg.getAllSelected() if len(entries) != 1 : - QtGui.QMessageBox.warning(self, self.tr("Error"), - self.tr("One item must be selected in the object browser")) + QMessageBox.warning(self, self.tr("Error"), + self.tr("One item must be selected in the object browser")) return selectedEntry = entries[0] self._initPotentialVariables(selectedEntry) @@ -71,13 +71,13 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog): def _initPotentialVariables(self, entry): sobj = getStudyEditor().study.FindObjectID(entry) if sobj is None: - QtGui.QMessageBox.warning(self, self.tr("Error"), - self.tr('No item at entry %s' % entry)) + QMessageBox.warning(self, self.tr("Error"), + self.tr('No item at entry %s' % entry)) return exchangeVariables = study_exchange_vars.getExchangeVariablesFromSObject(sobj) if exchangeVariables is None: - QtGui.QMessageBox.warning(self, self.tr("Error"), - self.tr('Item at entry %s is not a valid ' + QMessageBox.warning(self, self.tr("Error"), + self.tr('Item at entry %s is not a valid ' '"Variable List" object' % entry)) return self.refEntry = entry @@ -89,27 +89,27 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog): def addSelectedInputVar(self): for item in self.allInputVarListWidget.selectedItems(): - self.selectedInputVarListWidget.addItem(QtGui.QListWidgetItem(item)) + self.selectedInputVarListWidget.addItem(QListWidgetItem(item)) def removeSelectedInputVar(self): for item in self.selectedInputVarListWidget.selectedItems(): self.selectedInputVarListWidget.takeItem(self.selectedInputVarListWidget.row(item)) def newInputVar(self): - newItem = QtGui.QListWidgetItem("TO EDIT!") + newItem = QListWidgetItem("TO EDIT!") newItem.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEditable|Qt.ItemIsUserCheckable|Qt.ItemIsEnabled) self.selectedInputVarListWidget.addItem(newItem); def addSelectedOutputVar(self): for item in self.allOutputVarListWidget.selectedItems(): - self.selectedOutputVarListWidget.addItem(QtGui.QListWidgetItem(item)) + self.selectedOutputVarListWidget.addItem(QListWidgetItem(item)) def removeSelectedOutputVar(self): for item in self.selectedOutputVarListWidget.selectedItems(): self.selectedOutputVarListWidget.takeItem(self.selectedOutputVarListWidget.row(item)) def newOutputVar(self): - newItem = QtGui.QListWidgetItem("TO EDIT!") + newItem = QListWidgetItem("TO EDIT!") newItem.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEditable|Qt.ItemIsUserCheckable|Qt.ItemIsEnabled) self.selectedOutputVarListWidget.addItem(newItem); @@ -125,8 +125,8 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog): return study_exchange_vars.ExchangeVariables(inputVarList, outputVarList, self.refEntry) def loadVars(self): - filename = QtGui.QFileDialog.getOpenFileName(self, self.tr("Import variables from file"), - os.getenv("HOME"), + filename = QFileDialog.getOpenFileName(self, self.tr("Import variables from file"), + os.path.expanduser("~"), self.tr("XML Files (*.xml)")) if not filename: return @@ -134,13 +134,13 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog): filename = str(filename) exchange_variables = study_exchange_vars.loadExchangeVariablesFromXmlFile(filename) self.setExchangeVariables(exchange_variables) - except Exception, e: - QtGui.QMessageBox.critical(self, self.tr("Error"), - self.tr("Cannot load file %s:\n%s" % (filename, e))) + except Exception as e: + QMessageBox.critical(self, self.tr("Error"), + self.tr("Cannot load file %s:\n%s" % (filename, e))) def saveVars(self): - default = os.path.join(os.getenv("HOME"), "vars.xml") - filename = QtGui.QFileDialog.getSaveFileName(self, self.tr("Export variables to file"), + default = os.path.join(os.path.expanduser("~"), "vars.xml") + filename = QFileDialog.getSaveFileName(self, self.tr("Export variables to file"), default, self.tr("XML Files (*.xml)")) if not filename: return @@ -148,6 +148,6 @@ class MySelectVarsDialog(Ui_SelectVarsDialog, QtGui.QDialog): filename = str(filename) exchange_variables = self.getSelectedExchangeVariables() exchange_variables.saveToXmlFile(filename) - except Exception, e: - QtGui.QMessageBox.critical(self, self.tr("Error"), - self.tr("Cannot save file %s:\n%s" % (filename, e))) + except Exception as e: + QMessageBox.critical(self, self.tr("Error"), + self.tr("Cannot save file %s:\n%s" % (filename, e)))