From: rnc <rnc@opencascade.com>
Date: Fri, 23 Nov 2012 13:57:14 +0000 (+0000)
Subject: Pascale Noyret and rnc :
X-Git-Tag: V6_6_0rc1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2c51e345a07c6a7145862350958ffcfd9dd533b8;p=modules%2Fsmesh.git

Pascale Noyret and rnc :
- correction in yams plugin exportGMF has now a boolean argument
- default tab of yams plugin dialog is now the first one
- attempt to enable doc reading with okular besides kpdf
---

diff --git a/src/Tools/YamsPlug/YamsPlugDialog.ui b/src/Tools/YamsPlug/YamsPlugDialog.ui
index b2bc9a6eb..df7721e9f 100644
--- a/src/Tools/YamsPlug/YamsPlugDialog.ui
+++ b/src/Tools/YamsPlug/YamsPlugDialog.ui
@@ -105,7 +105,7 @@
       </font>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="simple">
       <attribute name="title">
diff --git a/src/Tools/YamsPlug/monYamsPlugDialog.py b/src/Tools/YamsPlug/monYamsPlugDialog.py
index 653644e21..6d293f6f3 100644
--- a/src/Tools/YamsPlug/monYamsPlugDialog.py
+++ b/src/Tools/YamsPlug/monYamsPlugDialog.py
@@ -62,11 +62,17 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
   def PBHelpPressed(self):
         try :
           maDoc=os.environ['DISTENE_YAMS_DOC_PDF']
+        except Exception:
+          QMessageBox.warning( self, "Help unavailable", str(maDoc) + " not found")
+        try :  
           commande='kpdf '+maDoc
           os.system (commande)
-        except:
-          QMessageBox.warning( self, "Help unavailable", str(maDoc) + " not found")
-
+        except Exception:
+          old_ld=os.getenv("LD_LIBRARY_PATH")
+          command="unset LD_LIBRARY_PATH;"
+          command+="okular "+maDoc+";"
+          command+="export LD_LIBRARY_PATH=%s"%old_ld
+          os.system(command)
 
   def PBOKPressed(self):
         if not(self.PrepareLigneCommande()) : return
@@ -233,7 +239,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
   def prepareFichier(self):
       self.fichierIn="/tmp/PourYam_"+str(self.num)+".mesh"
       import SMESH
-      self.__selectedMesh.ExportGMF(self.__selectedMesh,self.fichierIn)
+      self.__selectedMesh.ExportGMF(self.__selectedMesh,self.fichierIn, True)
 
   def PrepareLigneCommande(self):
       self.commande="yams "