Merge remote-tracking branch 'origin/V8_3_BR' into ngr/python3_dev

[modules/smesh.git] / src / Tools / ZCracksPlug / __init__.py

diff --git a/src/Tools/ZCracksPlug/__init__.py b/src/Tools/ZCracksPlug/__init__.py
index b06743239d89cb19450d834bcd7e059821ab6dad..967dc97cf00d65775ff9be8ede697db90a2845d0 100644 (file)
--- a/src/Tools/ZCracksPlug/__init__.py
+++ b/src/Tools/ZCracksPlug/__init__.py
@@ -2,15 +2,20 @@ import sys, os, shutil, pickle, tempfile
 from Zcracks import main, genereCrack, Zset
 from Zcracks import utilityFunctions as uF
 
+os.environ['QT_QPA_PLATFORM_PLUGIN_PATH']=os.path.join(os.environ['QTDIR'],'plugins','platforms')
+
+if 'MESHGEMSHOME' in os.environ:
+  meshgemsdir=os.environ['MESHGEMSHOME']
+  if len(meshgemsdir) > 0:
+    meshgems=meshgemsdir.split(os.sep)[-1]
+    uF.removeFromSessionPath('LD_LIBRARY_PATH', meshgems)
+
 #commande="/bin/bash -c ""source $HOME/zebulon/Z8.6.6_NEW/do_config_bash"""
 #os.system(commande)
 
 def IHM():
 
-  try:
-    from PyQt5.QtWidgets import QApplication
-  except:
-    from PyQt4.QtGui import QApplication
+  from PyQt5.QtWidgets import QApplication
 
   app = QApplication(sys.argv)
   myapp = main.ShipHolderApplication()
@@ -31,8 +36,7 @@ def SCRIPT(dataFile=None, data=None, dim=3, names=None):
 
   print(data)
 
-  tmpdir=tempfile.mkdtemp()
-  uF.removeFromSessionPath('LD_LIBRARY_PATH', 'Meshgems-2111')
+  tmpdir=tempfile.mkdtemp(prefix='tmpZcracks')
 
   if names==None: names={'saneGeoName':'salome_sane', 'crackGeoName':'salome_crack', 'crackedGeoName':'salome_cracked'}