Salome HOME
projects
/
plugins
/
ghs3dplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyrights
[plugins/ghs3dplugin.git]
/
src
/
GHS3DPlugin
/
GHS3DPlugin_GHS3D.hxx
diff --git
a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
index 5003a9a6d9eaae8dc8c3f152cd06250099ca7003..30ce9fbbd09d5b51a6beae29ed9b329c4932af57 100644
(file)
--- a/
src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
+++ b/
src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2004-201
5
CEA/DEN, EDF R&D
+// Copyright (C) 2004-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
@@
-34,11
+34,6
@@
#include <map>
#include <vector>
#include <map>
#include <vector>
-extern "C"
-{
- #include "libmesh5.h"
-}
-
#ifndef GMFVERSION
#define GMFVERSION GmfDouble
#endif
#ifndef GMFVERSION
#define GMFVERSION GmfDouble
#endif
@@
-55,7
+50,8
@@
class TopoDS_Shape;
class GHS3DPlugin_GHS3D: public SMESH_3D_Algo
{
public:
class GHS3DPlugin_GHS3D: public SMESH_3D_Algo
{
public:
- GHS3DPlugin_GHS3D(int hypId, int studyId, SMESH_Gen* gen);
+
+ GHS3DPlugin_GHS3D(int hypId, SMESH_Gen* gen);
virtual ~GHS3DPlugin_GHS3D();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
virtual ~GHS3DPlugin_GHS3D();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
@@
-66,7
+62,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,28
+76,33
@@
public:
bool importGMFMesh(const char* aGMFFileName, SMESH_Mesh& aMesh);
bool importGMFMesh(const char* aGMFFileName, SMESH_Mesh& aMesh);
+ virtual double GetProgress() const;
+
+
static const char* Name() { return "MG-Tetra"; }
static const char* Name() { return "MG-Tetra"; }
+ static SMESH_ComputeErrorPtr getErrorDescription(const char* logFile,
+ const std::string& log,
+ const _Ghs2smdsConvertor & toSmdsConvertor,
+ const bool isOK = false);
+
protected:
const GHS3DPlugin_Hypothesis* _hyp;
const StdMeshers_ViscousLayers* _viscousLayersHyp;
std::string _genericName;
protected:
const GHS3DPlugin_Hypothesis* _hyp;
const StdMeshers_ViscousLayers* _viscousLayersHyp;
std::string _genericName;
-
+
private:
private:
- bool storeErrorDescription(const TCollection_AsciiString& logFile,
- const _Ghs2smdsConvertor & toSmdsConvertor );
TopoDS_Shape entryToShape(std::string entry);
TopoDS_Shape entryToShape(std::string entry);
-
- int _iShape;
- int _nbShape;
- bool _keepFiles;
- bool _removeLogOnSuccess;
- bool _logInStandardOutput;
- SALOMEDS::Study_var myStudy;
- SMESH_Gen_i* smeshGen_i;
-
- volatile bool _compute_canceled;
+
+ int _iShape;
+ int _nbShape;
+ bool _keepFiles;
+ bool _removeLogOnSuccess;
+ bool _logInStandardOutput;
+
+ bool _isLibUsed;
+ double _progressAdvance;
};
/*!
};
/*!
@@
-121,6
+122,7
@@
public:
SMESH_ProxyMesh::Ptr mesh);
const SMDS_MeshElement* getElement(const std::vector<int>& ghsNodes) const;
SMESH_ProxyMesh::Ptr mesh);
const SMDS_MeshElement* getElement(const std::vector<int>& ghsNodes) const;
+ const SMDS_Mesh* getMesh() const;
};
#endif
};
#endif