Merge branch 'V9_9_BR'

[modules/smesh.git] / src / Tools / MGCleanerPlug / MGCleanerMonPlugDialog.py

diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py b/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
index 0818f537c2d21afd5cc2f6a24c4cf07d4978fe72..081c673c67e620c142f1a63356571cabc516fe85 100644 (file)
--- a/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
+++ b/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2013-2016  EDF R&D
+# Copyright (C) 2013-2022  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
@@ -69,7 +69,7 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
     self.PB_MeshFile.setToolTip("source mesh from a file in disk")
 
     #Ces parametres ne sont pas remis a rien par le clean
-    self.paramsFile= os.path.abspath(os.path.join(os.environ["HOME"],".MGCleaner.dat"))
+    self.paramsFile= os.path.abspath(os.path.join(os.path.expanduser("~"),".MGCleaner.dat"))
     self.LE_ParamsFile.setText(self.paramsFile)
     self.LE_MeshFile.setText("")
     self.LE_MeshSmesh.setText("")
@@ -368,7 +368,7 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
     for slig in reversed(text.split(separator)):
       lig=slig.strip()
       #print "load ResumeData",lig
-      if lig=="": continue #skip blanck lines
+      if lig=="": continue #skip blank lines
       if lig[0]=="#": break
       try:
         tit,value=lig.split("=")
@@ -525,18 +525,6 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
 
   def PrepareLigneCommande(self):
     """
-    #use doc examples of mg-cleaner:
-    ls -al /data/tmplgls/salome/prerequis/install/COMMON_64/MeshGems-1.0/bin
-    source /data/tmplgls/salome/prerequis/install/LICENSE/dlim8.var.sh
-    export PATH=/data/tmplgls/salome/prerequis/install/COMMON_64/MeshGems-1.0/bin/Linux_64:$PATH
-    cp -r /data/tmplgls/salome/prerequis/install/COMMON_64/MeshGems-1.0/examples .
-    cd examples
-    mg-cleaner.exe --help
-    mg-cleaner.exe --in case7.mesh --out case7-test.mesh --check
-    mg-cleaner.exe case7.mesh case7-fix.mesh --fix
-    mg-cleaner.exe --in Porsche.mesh --out Porsche-test.mesh --check
-    mg-cleaner.exe --in Porsche.mesh --out Porschefix.mesh --fix
-    mg-cleaner.exe --in Porsche.mesh --out PorscheNewfix.mesh --fix --resolution_length 0.03
     """
     
     #self.commande="mg-cleaner.exe --in " + self.fichierIn + " --out " + self.fichierOut + " --fix2pass" 
@@ -553,11 +541,10 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
     self.commande="mg-cleaner.exe"
     verbosity=str(self.SP_Verbosity.value())
     self.commande+=" --verbose " + verbosity
-    self.commande+=" --in " + self.fichierIn
-    #print "self.fichierIn",self.fichierIn,type(self.fichierIn)
+    self.commande+=' --in "' + self.fichierIn+'"'
     deb=os.path.splitext(str(self.fichierIn))
     self.fichierOut=deb[0] + "_fix.mesh"
-    self.commande+=" --out "+self.fichierOut
+    self.commande+=' --out "'+self.fichierOut+'"'
     if self.RB_Fix1.isChecked():
       self.commande+=" --mode fix"
     else:
@@ -578,6 +565,11 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
     if not self.CB_ComputedOverlapDistance.isChecked(): #computed default
       self.commande+=" --overlap_distance " + self.SP_toStr(self.SP_OverlapDistance)
     self.commande+=" --overlap_angle " + str(self.SP_OverlapAngle.value())
+
+    import SMeshHelper
+    key = SMeshHelper.GetMGLicenseKey( self.fichierIn )
+    self.commande+=' --key ' + key
+
     if verbose: print(("INFO: MGCCleaner command:\n  %s" % self.commande))
     return True