# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
name = "ADAO"
-version = "V7_8_0" # Version pour catalogue, avec des "_" entre les numeros
+version = "V8_1_0" # Version pour catalogue, avec des "_" entre les numeros
date = ""
year = "2016" # Annee de copyright
# print "passage dans la surcharge de configuration pour Adao"
import os, sys, string, types, re
import traceback
-from PyQt4.QtGui import *
+from daUtils.qtversion import useQT5
+if useQT5:
+ from PyQt5.QtGui import *
+else:
+ from PyQt4.QtGui import *
# Modules Eficas
from Editeur import utils
import eficasSalome # Import from EFICAS_SRC
from InterfaceQT4 import qtEficas # Import from Eficas
-from PyQt4.QtGui import * # Import from PyQT
-from PyQt4.QtCore import * # Import from PyQT
-# from PyQt4.QtAssistant import * # Import from PyQT
+from daUtils.qtversion import useQT5
+if useQT5:
+ from PyQt5.QtGui import * # Import from PyQT
+ from PyQt5.QtCore import * # Import from PyQT
+else:
+ from PyQt4.QtGui import * # Import from PyQT
+ from PyQt4.QtCore import * # Import from PyQT
+ # from PyQt5.QtAssistant import * # Import from PyQT
from daUtils.adaoEficasEvent import *
from daUtils.adaoLogger import *
def init_gui(self):
eficasSalome.MyEficas.__init__(self, self.__parent, code="ADAO", module="ADAO")
- self.connect(self.viewmanager.myQtab, SIGNAL('currentChanged(int)'), self.tabChanged)
+ if useQT5:
+ self.viewmanager.myQtab.currentChanged.connect(self.tabChanged)
+ else:
+ self.connect(self.viewmanager.myQtab, SIGNAL('currentChanged(int)'), self.tabChanged)
self.menubar.hide()
self.toolBar.hide()
+ if useQT5:
+ self.frameEntete.close()
def addJdcInSalome(self, jdcPath):
debug("addJdcInSalome is called " + str(jdcPath))
__author__="aribes/gboulant"
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from daUtils.qtversion import useQT5
+if useQT5:
+ from PyQt5.QtGui import *
+ from PyQt5.QtCore import *
+ from PyQt5.QtWidgets import QApplication
+else:
+ from PyQt4.QtGui import *
+ from PyQt4.QtCore import *
import SalomePyQt
sgPyQt = SalomePyQt.SalomePyQt()
__current_context__ = None
def _setContext( studyID ):
global __study2context__, __current_context__
+ QApplication.processEvents()
if not __study2context__.has_key(studyID):
__study2context__[studyID] = GUIcontext()
pass
def deactivate():
ctx = _setContext( sgPyQt.getStudyId() )
ctx.adaoCaseManager.deactivate()
- pass
# called when active study is changed
# active study ID is passed as parameter
def activeStudyChanged( studyID ):
ctx = _setContext( sgPyQt.getStudyId() )
- pass
# called when popup menu is invoked
# popup menu and menu context are passed as parameters
Called when an event is raised from a graphic item (click on menu item or
toolbar button). The actionId value is the ID associated to the item.
"""
- pass
ctx = _setContext( sgPyQt.getStudyId() )
ctx.adaoCaseManager.processGUIEvent(actionId)
# called when active view is changed
# view ID is passed as parameter
def activeViewChanged( viewID ):
- pass
+ pass
# called when active view is cloned
# cloned view ID is passed as parameter
__sgPyQt = SalomePyQt.SalomePyQt()
import adaoModuleHelper
-from PyQt4 import QtGui,QtCore
+from daUtils.qtversion import useQT5
+if useQT5:
+ from PyQt5 import QtGui,QtCore
+else:
+ from PyQt4 import QtGui,QtCore
def waitCursor():
QtGui.QApplication.setOverrideCursor(QtGui.QCursor(QtCore.Qt.WaitCursor))
__author__ = "aribes/gboulant"
import traceback
-from PyQt4.QtCore import QObject
-from PyQt4.QtCore import * # Import from PyQT
-from PyQt4 import QtGui,QtCore
+from daUtils.qtversion import useQT5
+if useQT5:
+ from PyQt5.QtCore import QObject
+ from PyQt5.QtWidgets import QScrollArea
+else:
+ from PyQt4.QtCore import QObject
+ from PyQt4.QtCore import * # Import from PyQT
+ from PyQt4 import QtCore
+ from PyQt4.QtGui import QScrollArea
import SalomePyQt
sgPyQt = SalomePyQt.SalomePyQt()
# Creation du viewer QT
# Scroll Widget (pour les petites resolutions)
- area = QtGui.QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
+ area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop());
area.setWidget(self.eficas_manager)
area.setWidgetResizable(1)
wmType = "ADAO View"
# On s'abonne au gestionnaire de selection
self.selection_manager = sgPyQt.getSelection()
- QtCore.QObject.connect(self.selection_manager, QtCore.SIGNAL('currentSelectionChanged()'), self.currentSelectionChanged)
+ if useQT5:
+ self.selection_manager.currentSelectionChanged.connect(self.currentSelectionChanged)
+ else:
+ QtCore.QObject.connect(self.selection_manager, QtCore.SIGNAL('currentSelectionChanged()'), self.currentSelectionChanged)
######
#
# _MEM_ we use here the tr() translation methode to manage constant parameters
# in the application. We could have specified instead constant values directly
# in the code below. It's a matter of convenience.
-from PyQt4.QtCore import QObject
+from daUtils.qtversion import useQT5
+if useQT5:
+ from PyQt5.QtCore import QObject
+else:
+ from PyQt4.QtCore import QObject
QObjectTR=QObject()
def componentUserName():
__init__.py \
adaoEficasEvent.py \
adaoLogger.py \
+ qtversion.py \
enumerate.py
--- /dev/null
+#-*-coding:iso-8859-1-*-
+#
+# Copyright (C) 2008-2016 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
+
+import eficasSalome # Import from EFICAS_SRC
+from InterfaceQT4.determine import monEnvQT5
+
+useQT5 = bool(monEnvQT5)
