Salome HOME
projects
/
plugins
/
hybridplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update 2020
[plugins/hybridplugin.git]
/
src
/
HYBRIDPlugin
/
HYBRIDPlugin_HYBRID.hxx
diff --git
a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx
b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx
index 9dc172a21a9de0fa35b2797da7743bb9912e59e8..08541e96510eab75dac075d8d6268bbb736030a8 100644
(file)
--- a/
src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx
+++ b/
src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D
+// Copyright (C) 2007-20
20
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
@@
-32,16
+32,6
@@
#include <map>
#include <vector>
#include <map>
#include <vector>
-extern "C"
-{
- #include "libmesh5.h"
-}
-
-#ifndef GMFVERSION
-#define GMFVERSION GmfDouble
-#endif
-#define GMFDIMENSION 3
-
class HYBRIDPlugin_Hypothesis;
class SMDS_MeshNode;
class SMESH_Mesh;
class HYBRIDPlugin_Hypothesis;
class SMDS_MeshNode;
class SMESH_Mesh;
@@
-53,7
+43,7
@@
class TopoDS_Shape;
class HYBRIDPlugin_HYBRID: public SMESH_3D_Algo
{
public:
class HYBRIDPlugin_HYBRID: public SMESH_3D_Algo
{
public:
- HYBRIDPlugin_HYBRID(int hypId,
int studyId,
SMESH_Gen* gen);
+ HYBRIDPlugin_HYBRID(int hypId, SMESH_Gen* gen);
virtual ~HYBRIDPlugin_HYBRID();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
virtual ~HYBRIDPlugin_HYBRID();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
@@
-64,7
+54,7
@@
public:
const TopoDS_Shape& aShape);
virtual void CancelCompute();
const TopoDS_Shape& aShape);
virtual void CancelCompute();
- bool computeCanceled() { return _compute
_canceled;};
+ bool computeCanceled() { return _compute
Canceled; }
virtual bool Evaluate(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape,
MapShapeNbElems& aResMap);
virtual bool Evaluate(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape,
MapShapeNbElems& aResMap);
@@
-80,15
+70,18
@@
public:
static const char* Name() { return "HYBRID_3D"; }
static const char* Name() { return "HYBRID_3D"; }
+ const HYBRIDPlugin_Hypothesis* getHyp() {return _hyp ;}
+
protected:
const HYBRIDPlugin_Hypothesis* _hyp;
protected:
const HYBRIDPlugin_Hypothesis* _hyp;
- const StdMeshers_ViscousLayers* _viscousLayersHyp;
+
//
const StdMeshers_ViscousLayers* _viscousLayersHyp;
std::string _genericName;
private:
std::string _genericName;
private:
- bool storeErrorDescription(const TCollection_AsciiString& logFile,
- const _Ghs2smdsConvertor & toSmdsConvertor );
+ bool storeErrorDescription(const char* logFile,
+ const std::string& log,
+ const _Ghs2smdsConvertor & toSmdsConvertor );
TopoDS_Shape entryToShape(std::string entry);
int _iShape;
TopoDS_Shape entryToShape(std::string entry);
int _iShape;
@@
-96,10
+89,6
@@
private:
bool _keepFiles;
bool _removeLogOnSuccess;
bool _logInStandardOutput;
bool _keepFiles;
bool _removeLogOnSuccess;
bool _logInStandardOutput;
- SALOMEDS::Study_var myStudy;
- SMESH_Gen_i* smeshGen_i;
-
- volatile bool _compute_canceled;
};
/*!
};
/*!