Salome HOME
projects
/
plugins
/
hexoticplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyrights
[plugins/hexoticplugin.git]
/
src
/
HexoticPlugin
/
HexoticPlugin_Hexotic.cxx
diff --git
a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
index 2d32c1db284a3cfffbac73f0d2429efa71f1be45..cc623a3364b023b4f840a2667bd7d638a082d563 100644
(file)
--- a/
src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
+++ b/
src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D
+// Copyright (C) 2007-201
9
CEA/DEN, 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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-47,6
+47,7
@@
#include <SMESH_HypoFilter.hxx>
#include <SMESH_MesherHelper.hxx>
#include <SMESH_subMesh.hxx>
#include <SMESH_HypoFilter.hxx>
#include <SMESH_MesherHelper.hxx>
#include <SMESH_subMesh.hxx>
+#include <SMESH_MeshEditor.hxx>
#include <SMESH_ControlPnt.hxx>
#include <list>
#include <SMESH_ControlPnt.hxx>
#include <list>
@@
-126,7
+127,7
@@
HexoticPlugin_Hexotic::~HexoticPlugin_Hexotic()
bool HexoticPlugin_Hexotic::CheckBLSURFHypothesis( SMESH_Mesh& aMesh,
const TopoDS_Shape& aShape )
{
bool HexoticPlugin_Hexotic::CheckBLSURFHypothesis( SMESH_Mesh& aMesh,
const TopoDS_Shape& aShape )
{
-
//
MESSAGE("HexoticPlugin_Hexotic::CheckBLSURFHypothesis");
+ MESSAGE("HexoticPlugin_Hexotic::CheckBLSURFHypothesis");
_blsurfHypo = NULL;
std::list<const SMESHDS_Hypothesis*>::const_iterator itl;
_blsurfHypo = NULL;
std::list<const SMESHDS_Hypothesis*>::const_iterator itl;
@@
-165,7
+166,7
@@
bool HexoticPlugin_Hexotic::CheckHypothesis( SMESH_Mesh&
const TopoDS_Shape& aShape,
SMESH_Hypothesis::Hypothesis_Status& aStatus )
{
const TopoDS_Shape& aShape,
SMESH_Hypothesis::Hypothesis_Status& aStatus )
{
-
//
MESSAGE("HexoticPlugin_Hexotic::CheckHypothesis");
+ MESSAGE("HexoticPlugin_Hexotic::CheckHypothesis");
_hypothesis = NULL;
std::list<const SMESHDS_Hypothesis*>::const_iterator itl;
_hypothesis = NULL;
std::list<const SMESHDS_Hypothesis*>::const_iterator itl;
@@
-174,6
+175,10
@@
bool HexoticPlugin_Hexotic::CheckHypothesis( SMESH_Mesh&
const std::list<const SMESHDS_Hypothesis*>& hyps = GetUsedHypothesis(aMesh, aShape, false);
int nbHyp = hyps.size();
if (!nbHyp) {
const std::list<const SMESHDS_Hypothesis*>& hyps = GetUsedHypothesis(aMesh, aShape, false);
int nbHyp = hyps.size();
if (!nbHyp) {
+ // retrieve BLSURF hypothesis if no hexotic hypothesis has been set
+#ifdef WITH_BLSURFPLUGIN
+ CheckBLSURFHypothesis(aMesh, aShape);
+#endif
aStatus = SMESH_Hypothesis::HYP_OK;
return true; // can work with no hypothesis
}
aStatus = SMESH_Hypothesis::HYP_OK;
return true; // can work with no hypothesis
}
@@
-1037,11
+1042,12
@@
bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh& aMesh,
Hexotic_Out = aTmpDir + "Hexotic"+getSuffix()+"_Out.mesh";
#ifdef WITH_BLSURFPLUGIN
bool defaultInputFile = true;
Hexotic_Out = aTmpDir + "Hexotic"+getSuffix()+"_Out.mesh";
#ifdef WITH_BLSURFPLUGIN
bool defaultInputFile = true;
- if (_blsurfHypo &&
!_blsurfHypo->GetQuadAllowed()
) {
+ if (_blsurfHypo &&
_blsurfHypo->GetElementType() == BLSURFPlugin_Hypothesis::Triangles
) {
Hexotic_In = _blsurfHypo->GetGMFFile().c_str();
if ( !Hexotic_In.IsEmpty() &&
SMESH_File( _blsurfHypo->GetGMFFile() ).exists() )
{
Hexotic_In = _blsurfHypo->GetGMFFile().c_str();
if ( !Hexotic_In.IsEmpty() &&
SMESH_File( _blsurfHypo->GetGMFFile() ).exists() )
{
+ MESSAGE("Use output file from blsurf as input file from hexotic: " << Hexotic_In);
mgHexa.SetUseExecutable();
defaultInputFile = false;
}
mgHexa.SetUseExecutable();
defaultInputFile = false;
}