# -*- coding: utf-8 -*-
-# Copyright (C) 2013-2016 EDF R&D
+# Copyright (C) 2013-2021 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
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("")
def getResumeData(self, separator="\n"):
text=""
if self.RB_Fix1.isChecked():
- CheckOrFix="fix1pass"
+ CheckOrFix="mode_fix"
else:
- if self.RB_Fix2.isChecked():
- CheckOrFix="fix2pass"
- else:
- CheckOrFix="check"
+ CheckOrFix="mode_check"
text+="CheckOrFix="+CheckOrFix+separator
text+="PreserveTopology="+str(self.CB_PreserveTopology.isChecked())+separator
text+="FillHoles="+str(self.CB_FillHoles.isChecked())+separator
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("=")
if tit=="CheckOrFix":
self.RB_Fix1.setChecked(False)
- self.RB_Fix2.setChecked(False)
self.RB_Check.setChecked(False)
- if value=="fix1pass": self.RB_Fix1.setChecked(True)
- if value=="fix2pass": self.RB_Fix2.setChecked(True)
- if value=="check": self.RB_Check.setChecked(True)
+ if value=="mode_fix": self.RB_Fix1.setChecked(True)
+ if value=="mode_check": self.RB_Check.setChecked(True)
if tit=="PreserveTopology": self.CB_PreserveTopology.setChecked(value=="True")
if tit=="FillHoles": self.CB_FillHoles.setChecked(value=="True")
if tit=="MinHoleSize": self.SP_MinHoleSize.setProperty("text", value)
if fd.exec_():
infile = fd.selectedFiles()[0]
self.LE_MeshFile.setText(infile)
- self.fichierIn=str(infile).encode("latin-1")
+ self.fichierIn=str(infile)
self.MeshIn=""
self.LE_MeshSmesh.setText("")
+ self.__selectedMesh=None
def setParamsFileName(self):
fd = QFileDialog(self, "select a file", self.LE_ParamsFile.text(), "dat Files (*.dat);;All Files (*)")
if fd.exec_():
infile = fd.selectedFiles()[0]
self.LE_ParamsFile.setText(infile)
- self.paramsFile=str(infile).encode("latin-1")
+ self.paramsFile=str(infile)
def meshFileNameChanged(self):
self.fichierIn=str(self.LE_MeshFile.text())
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"
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+=" --fix1pass"
+ self.commande+=" --mode fix"
else:
- if self.RB_Fix2.isChecked():
- self.commande+=" --fix2pass"
- else:
- self.commande+=" --check"
+ self.commande+=" --mode check"
if self.CB_PreserveTopology.isChecked():
self.commande+=" --topology respect"
else:
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
def clean(self):
self.RB_Check.setChecked(False)
- self.RB_Fix1.setChecked(False)
- self.RB_Fix2.setChecked(True)
+ self.RB_Fix1.setChecked(True)
self.CB_PreserveTopology.setChecked(False)
self.CB_FillHoles.setChecked(False)
self.CB_RemeshPlanes.setChecked(False)