Merge branch 'V7_dev'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33a4fddba84ede52d6df93421af2037da7ca8ad0..c6627788d13e906433c7f07cfc52ef39bb1bfeac 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,8 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
@@ -83,9 +83,12 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 ##
 ## From GUI:
 ##
-# Qt4
-FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-INCLUDE(${QT_USE_FILE})
+# Qt
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+ELSE()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
+ENDIF()
 
 # Directories
 # (default values taken from KERNEL)

diff --git a/src/PYLIGHTGUI/CMakeLists.txt b/src/PYLIGHTGUI/CMakeLists.txt
index b6b2689a914179a0b488124a24273952cdb6b7ac..809c06667c92ee4f9ba0d07c29c2d0c1ebf3b447 100755 (executable)
--- a/src/PYLIGHTGUI/CMakeLists.txt
+++ b/src/PYLIGHTGUI/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
@@ -44,4 +44,4 @@ SET(_ts_RESOURCES
 # --- rules ---
 
 SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYLIGHT_INSTALL_RES_DATA}")
\ No newline at end of file
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYLIGHT_INSTALL_RES_DATA}")

diff --git a/src/PYLIGHTGUI/PYLIGHTGUI.py b/src/PYLIGHTGUI/PYLIGHTGUI.py
index 198dae10b02a9edeb4772a164ba93d57b91c2f52..dc2ec8c940d8211df374e5d7431928120be4100c 100644 (file)
--- a/src/PYLIGHTGUI/PYLIGHTGUI.py
+++ b/src/PYLIGHTGUI/PYLIGHTGUI.py
@@ -23,8 +23,7 @@
 import traceback
 from SalomePyQt import *
 import PYLIGHT_DataModel
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from qtsalome import *
 import libSALOME_Swig
 
 import os
@@ -224,7 +223,7 @@ def saveFiles(prefix):
     ctx = _setContext( _getStudyId() )
     postfix = "PYLIGHT.txt"
     filename = prefix+postfix
-    ctx.DM.saveFile(QString(filename))
+    ctx.DM.saveFile(filename)
     return postfix
 
 # For restore data from the study
@@ -241,7 +240,14 @@ def loadfile():
     ctx = _setContext( _getStudyId() )
     aFilter = "Text files (*.txt)"
     filename = QFileDialog.getOpenFileName(sgPyQt.getDesktop(), "Open text file", "", aFilter, "Choose a text file to open")
-    if filename.isEmpty():
+
+    print filename
+    if isinstance(filename,tuple) and len(filename) >=2:
+       filename = filename[0]
+
+    filename = unicode(filename)
+
+    if len(filename) == 0:
         return
     
     if os.access(str(filename),os.R_OK):
@@ -249,7 +255,7 @@ def loadfile():
     else:
         QMessageBox.warning(sgPyQt.getDesktop(),
                             "Error!",
-                            QString("Can not read file:\n%1").arg(filename))
+                            "Can not read file:\n%s"%(filename))
         pass
     sg.updateObjBrowser(True)
     pass
@@ -259,17 +265,25 @@ def savefile():
     ctx = _setContext( _getStudyId() )
     aFilter = "Text files (*.txt)"
     filename = QFileDialog.getSaveFileName(sgPyQt.getDesktop(),"Save text file", "", aFilter, "Choose a text file to save")
-    if filename.contains(".txt") == 0:
-        filename.append(".txt")
+
+    print filename
+    if isinstance(filename,tuple) and len(filename) >=2:
+        filename = filename[0]
+
+    filename = unicode(filename)
+
+    if filename.endswith(".txt") == 0:
+        filename+=".txt"
         pass
+
     fn = filename
     # Get directory name and check access
-    if os.access(str(fn.left(fn.lastIndexOf("/"))), os.W_OK):
+    if os.access(str(fn[:fn.rindex(os.path.sep)]), os.W_OK):
         ctx.DM.saveFile(filename)
     else:
         QMessageBox.warning(sgPyQt.getDesktop(),
                             "Error!",
-                            QString("Can not save file:\n%1").arg(filename))
+                            "Can not save file:\n%s"%(filename))
         pass
     pass
 
@@ -287,6 +301,7 @@ def insertLine():
         return
     
     text = res[0]
+    print "RNV: !", res
     # Nb selected objects
     selcount = sg.SelectedCount()
     # Nb object in the Data Model
@@ -459,8 +474,7 @@ def eraseLine():
 
 # Return vtkActor by entry
 def getActor(entry):
-    if isinstance(entry,QString):
-        entry = entry.toLatin1().data()
+    entry = str(entry)
     if dict_actors.has_key(entry):
         return dict_actors[entry]
     return None

diff --git a/src/PYLIGHTGUI/PYLIGHT_DataModel.py b/src/PYLIGHTGUI/PYLIGHT_DataModel.py
index 857ec33f307a219b6858fd5c490c8ff456720a9b..c1b52797e5c8c6c56513ff1445767b0cd7859027 100644 (file)
--- a/src/PYLIGHTGUI/PYLIGHT_DataModel.py
+++ b/src/PYLIGHTGUI/PYLIGHT_DataModel.py
@@ -21,7 +21,7 @@
 #  Date   : 13/04/2009
 #
 import SalomePyQt
-from PyQt4.QtCore import *
+from qtsalome import *
 
 # Get SALOME PyQt interface
 sgPyQt=SalomePyQt.SalomePyQt()
@@ -30,9 +30,7 @@ def processText(text):
     '''
     Remove "\n" sumbol from end of line
     '''
-    processed = text
-    if isinstance(text,QString):
-        processed = text.toLatin1().data()
+    processed = str(text)
     if processed[len(processed)-1:] == "\n":
         processed = processed[:len(processed)-1]