X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FYamsPlug%2FmonYamsPlugDialog.py;h=7f43838c450cd950f209b5d4244041b1b6c6c5ed;hp=d8ec10244e0363a90a57134d75ce0dcb82512d41;hb=8fff0ccaded5504f785ff689fea994ea208f1490;hpb=51aa4c4a2d1d6b180791d0c063dcc23fded5333c diff --git a/src/Tools/YamsPlug/monYamsPlugDialog.py b/src/Tools/YamsPlug/monYamsPlugDialog.py index d8ec10244..7f43838c4 100644 --- a/src/Tools/YamsPlug/monYamsPlugDialog.py +++ b/src/Tools/YamsPlug/monYamsPlugDialog.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +22,7 @@ # Modules Eficas import os, subprocess -from YamsPlugDialog import Ui_YamsPlugDialog +from YamsPlugDialog_ui import Ui_YamsPlugDialog from monViewText import MonViewText from PyQt4.QtGui import * from PyQt4.QtCore import * @@ -76,7 +76,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): v1=QDoubleValidator(self) v1.setBottom(0.) #v1.setTop(1000.) #per thousand... only if relative - v1.setDecimals(2) + v1.setDecimals(3) self.SP_Tolerance.setValidator(v1) self.SP_Tolerance.titleForWarning="Chordal Tolerance" @@ -102,14 +102,20 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): self.connect(self.LE_ParamsFile,SIGNAL("returnPressed()"),self.paramsFileNameChanged) def PBHelpPressed(self): + import SalomePyQt + sgPyQt = SalomePyQt.SalomePyQt() try : mydir=os.environ["SMESH_ROOT_DIR"] except Exception: QMessageBox.warning(self, "Help", "Help unavailable $SMESH_ROOT_DIR not found") return - maDoc=mydir+"/share/doc/salome/gui/SMESH/yams/_downloads/YamsWhitePaper_3.2.pdf" - command="xdg-open "+maDoc+";" - subprocess.call(command, shell=True) + + maDoc=mydir+"/share/doc/salome/gui/SMESH/yams/index.html" + sgPyQt.helpContext(maDoc,"") + + #maDoc=mydir+"/share/doc/salome/gui/SMESH/yams/_downloads/mg-surfopt_user_manual.pdf" + #command="xdg-open "+maDoc+";" + #subprocess.call(command, shell=True) def PBOKPressed(self): if not(self.PrepareLigneCommande()): @@ -401,7 +407,11 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): mySObject, myEntry = guihelper.getSObjectSelected() if CORBA.is_nil(mySObject) or mySObject==None: - QMessageBox.critical(self, "Mesh", "select an input mesh") + #QMessageBox.critical(self, "Mesh", "select an input mesh") + self.LE_MeshSmesh.setText("") + self.MeshIn="" + self.LE_MeshFile.setText("") + self.fichierIn="" return self.smeshStudyTool = SMeshStudyTools() try: @@ -420,7 +430,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): self.fichierIn="" def prepareFichier(self): - self.fichierIn="/tmp/ForYams_"+str(self.num)+".mesh" + self.fichierIn="/tmp/ForSurfOpt_"+str(self.num)+".meshb" self.__selectedMesh.ExportGMF(self.__selectedMesh, self.fichierIn, True) def PrepareLigneCommande(self): @@ -432,9 +442,8 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): QMessageBox.critical(self, "File", "unable to read GMF Mesh in "+str(self.fichierIn)) return False - self.commande="yams" - verbosity=str(self.SP_Verbosity.value()) - self.commande+=" -v "+verbosity + self.commande="mg-surfopt.exe" + for obj in self.GBOptim.findChildren(QRadioButton,): try: if obj.isChecked(): @@ -443,31 +452,47 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): break except: pass - self.commande+=" -O "+self.style.toLatin1() + + style = self.style.toLatin1() + # Translation of old Yams options to new MG-SurfOpt options + if style == "0" : + self.commande+= " --optimisation only" + elif style == "2" : + self.commande+= " --Hausdorff_like yes" + elif style == "-1": + self.commande+= " --enrich no" + elif style == "-2": + self.commande+= " --Hausdorff_like yes --enrich no" + elif style == "U" : + self.commande+= " --uniform_flat_subdivision yes" + elif style == "S" : + self.commande+= " --sand_paper yes" + elif style == "G" : + self.commande+= " -O G" # This option has not been updated to the new option style yet deb=os.path.splitext(self.fichierIn) - self.fichierOut=deb[0] + ".d.meshb" - - if self.RB_Absolute.isChecked()==True : - self.commande+=" -Dabsolute" - else : - self.commande+=" -Drelative" + self.fichierOut=deb[0] + "_output.meshb" - v=self.SP_toStr(self.SP_Tolerance) - self.commande+=",tolerance="+v - if self.CB_Ridge.isChecked()==False : self.commande+=",-nr" - if self.CB_Point.isChecked()==False : self.commande+=",-ns" - if self.SP_Geomapp.value()!=0.04 : self.commande+=",geomapp=%f"%self.SP_Geomapp.value() - if self.SP_Ridge.value()!=45.0 : self.commande+=",ridge=%f"%self.SP_Ridge.value() - if self.SP_MaxSize.value()!=100 : self.commande+=",maxsize=%f"%self.SP_MaxSize.value() - if self.SP_MinSize.value()!=5 : self.commande+=",minsize=%f"%self.SP_MinSize.value() - if self.SP_Gradation.value()!=1.3 : self.commande+=",gradation=%f"%self.SP_MaxSize.value() - if self.CB_SplitEdge.isChecked()==True : self.commande+=",splitedge=1" - - if self.SP_Verbosity.value()!=3 : self.commande+=" -v %d"%self.SP_Verbosity.value() - if self.SP_Memory.value()!=0 : self.commande+=" -m %d"%self.SP_Memory.value() - - self.commande+=" "+self.fichierIn + tolerance=self.SP_toStr(self.SP_Tolerance) + if not self.RB_Absolute.isChecked(): + tolerance+="r" + self.commande+=" --chordal_error %s"%tolerance + + if self.CB_Ridge.isChecked() == False : self.commande+=" --compute_ridges no" + if self.CB_Point.isChecked() == False : self.commande+=" --optimisation no" + if self.CB_SplitEdge.isChecked()== True : self.commande+=" --element_order quadratic" + if self.SP_Geomapp.value() != 15.0 : self.commande+=" --geometric_approximation_angle %f"%self.SP_Geomapp.value() + if self.SP_Ridge.value() != 45.0 : self.commande+=" --ridge_angle %f"%self.SP_Ridge.value() + if self.SP_MaxSize.value() != 100 : self.commande+=" --max_size %f" %self.SP_MaxSize.value() + if self.SP_MinSize.value() != 5 : self.commande+=" --min_size %f" %self.SP_MinSize.value() + if self.SP_Gradation.value() != 1.3 : self.commande+=" --gradation %f" %self.SP_MaxSize.value() + if self.SP_Memory.value() != 0 : self.commande+=" --max_memory %d" %self.SP_Memory.value() + if self.SP_Verbosity.value() != 3 : self.commande+=" --verbose %d" %self.SP_Verbosity.value() + + self.commande+=" --in " + self.fichierIn + self.commande+=" --out " + self.fichierOut + + print self.commande return True def clean(self): @@ -481,29 +506,31 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): self.RB_Relative.setChecked(True) #no need: exlusives QRadioButton #self.RB_Absolute.setChecked(False) - self.SP_Tolerance.setProperty("text", "10.") - self.SP_Geomapp.setProperty("value", 0.04) + self.SP_Tolerance.setProperty("text", "0.001") + self.SP_Geomapp.setProperty("value", 15.0) self.SP_Ridge.setProperty("value", 45.0) self.SP_Gradation.setProperty("value", 1.3) self.CB_Ridge.setChecked(True) self.CB_Point.setChecked(True) self.CB_SplitEdge.setChecked(False) - self.SP_MaxSize.setProperty("value", -2.0) - self.SP_MinSize.setProperty("value", -2.0) + self.SP_MaxSize.setProperty("value", 100) + self.SP_MinSize.setProperty("value", 5) self.SP_Verbosity.setProperty("value", 3) self.SP_Memory.setProperty("value", 0) + self.PBMeshSmeshPressed() + self.TWOptions.setCurrentIndex(0) # Reset current active tab to the first tab __dialog=None def getDialog(): """ This function returns a singleton instance of the plugin dialog. - c est obligatoire pour faire un show sans parent... + It is mandatory in order to call show without a parent ... """ global __dialog if __dialog is None: __dialog = MonYamsPlugDialog() - #else : - # __dialog.clean() + else : + __dialog.clean() return __dialog #