Fem: include FemGlobal.h

This commit is contained in:
wmayer
2021-12-18 14:35:20 +01:00
parent ada653e591
commit 99dc3fec76
48 changed files with 66 additions and 53 deletions

View File

@@ -87,7 +87,7 @@ template<> const char* Fem::FemAnalysisPython::getViewProviderName(void) const {
/// @endcond
// explicit template instantiation
template class AppFemExport FeaturePythonT<Fem::FemAnalysis>;
template class FemExport FeaturePythonT<Fem::FemAnalysis>;
}
// ---------------------------------------------------------
@@ -106,6 +106,6 @@ template<> PyObject* Fem::FeaturePython::getPyObject(void) {
return Py::new_reference_to(PythonObject);
}
// explicit template instantiation
template class AppFemExport FeaturePythonT<Fem::DocumentObject>;
template class FemExport FeaturePythonT<Fem::DocumentObject>;
/// @endcond
}

View File

@@ -26,6 +26,7 @@
#include <App/DocumentObjectGroup.h>
#include <App/PropertyLinks.h>
#include <App/FeaturePython.h>
#include <Mod/Fem/FemGlobal.h>
namespace Fem {
@@ -48,7 +49,7 @@ namespace Fem {
* Analysis object. Every document object of FreeCAD can be part of a
* Analysis.
*/
class AppFemExport FemAnalysis : public App::DocumentObjectGroup {
class FemExport FemAnalysis : public App::DocumentObjectGroup {
PROPERTY_HEADER(Fem::FemAnalysis);
public:
@@ -85,7 +86,7 @@ protected:
Base::XMLReader &reader, const char * TypeName, const char *PropName);
};
class AppFemExport DocumentObject : public App::DocumentObject
class FemExport DocumentObject : public App::DocumentObject
{
PROPERTY_HEADER(Fem::DocumentObject);
};

View File

@@ -501,7 +501,7 @@ template<> PyObject* Fem::ConstraintPython::getPyObject(void) {
}
// explicit template instantiation
template class AppFemExport FeaturePythonT<Fem::Constraint>;
template class FemExport FeaturePythonT<Fem::Constraint>;
/// @endcond

View File

@@ -30,6 +30,7 @@
#include <App/DocumentObject.h>
#include <App/PropertyLinks.h>
#include <App/PropertyGeo.h>
#include <Mod/Fem/FemGlobal.h>
namespace Fem {
@@ -55,7 +56,7 @@ namespace Fem {
* and @ref Scale and the protected method @ref getPoints(points&, normals&,
* scale&).
*/
class AppFemExport Constraint : public App::DocumentObject {
class FemExport Constraint : public App::DocumentObject {
PROPERTY_HEADER(Fem::Constraint);
public:

View File

@@ -34,7 +34,7 @@
namespace Fem
{
class AppFemExport ConstraintBearing : public Fem::Constraint
class FemExport ConstraintBearing : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintBearing);

View File

@@ -30,7 +30,7 @@
namespace Fem
{
class AppFemExport ConstraintContact : public Fem::Constraint
class FemExport ConstraintContact : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintContact);

View File

@@ -32,7 +32,7 @@
namespace Fem
{
class AppFemExport ConstraintDisplacement : public Fem::Constraint
class FemExport ConstraintDisplacement : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintDisplacement);

View File

@@ -34,7 +34,7 @@
namespace Fem
{
class AppFemExport ConstraintFixed : public Fem::Constraint
class FemExport ConstraintFixed : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintFixed);

View File

@@ -35,7 +35,7 @@
namespace Fem
{
class AppFemExport ConstraintFluidBoundary: public Fem::Constraint
class FemExport ConstraintFluidBoundary: public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintFluidBoundary);

View File

@@ -34,7 +34,7 @@
namespace Fem
{
class AppFemExport ConstraintForce : public Fem::Constraint
class FemExport ConstraintForce : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintForce);

View File

@@ -34,7 +34,7 @@
namespace Fem
{
class AppFemExport ConstraintGear : public Fem::ConstraintBearing
class FemExport ConstraintGear : public Fem::ConstraintBearing
{
PROPERTY_HEADER(Fem::ConstraintGear);

View File

@@ -31,7 +31,7 @@
namespace Fem {
class AppFemExport ConstraintHeatflux : public Fem::Constraint
class FemExport ConstraintHeatflux : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintHeatflux);

View File

@@ -32,7 +32,7 @@
namespace Fem
{
class AppFemExport ConstraintInitialTemperature : public Fem::Constraint
class FemExport ConstraintInitialTemperature : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintInitialTemperature);

View File

@@ -30,7 +30,7 @@
namespace Fem
{
class AppFemExport ConstraintPlaneRotation : public Fem::Constraint
class FemExport ConstraintPlaneRotation : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintPlaneRotation);

View File

@@ -29,7 +29,7 @@
namespace Fem {
class AppFemExport ConstraintPressure : public Fem::Constraint
class FemExport ConstraintPressure : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintPressure);

View File

@@ -34,7 +34,7 @@
namespace Fem
{
class AppFemExport ConstraintPulley : public Fem::ConstraintGear
class FemExport ConstraintPulley : public Fem::ConstraintGear
{
PROPERTY_HEADER(Fem::ConstraintPulley);

View File

@@ -29,7 +29,7 @@
namespace Fem {
class AppFemExport ConstraintSpring : public Fem::Constraint
class FemExport ConstraintSpring : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintSpring);

View File

@@ -32,7 +32,7 @@
namespace Fem
{
class AppFemExport ConstraintTemperature : public Fem::Constraint
class FemExport ConstraintTemperature : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintTemperature);

View File

@@ -29,7 +29,7 @@
namespace Fem
{
class AppFemExport ConstraintTransform : public Fem::Constraint
class FemExport ConstraintTransform : public Fem::Constraint
{
PROPERTY_HEADER(Fem::ConstraintTransform);

View File

@@ -27,6 +27,7 @@
#include <App/ComplexGeoData.h>
#include <Base/Placement.h>
#include <Base/Quantity.h>
#include <Mod/Fem/FemGlobal.h>
#include <vector>
#include <list>
@@ -50,7 +51,7 @@ typedef std::shared_ptr<SMESH_Hypothesis> SMESH_HypothesisPtr;
/** The representation of a FemMesh
*/
class AppFemExport FemMesh : public Data::ComplexGeoData
class FemExport FemMesh : public Data::ComplexGeoData
{
TYPESYSTEM_HEADER();

View File

@@ -91,7 +91,7 @@ template<> PyObject* Fem::FemMeshObjectPython::getPyObject(void) {
}
// explicit template instantiation
template class AppFemExport FeaturePythonT<Fem::FemMeshObject>;
template class FemExport FeaturePythonT<Fem::FemMeshObject>;
/// @endcond

View File

@@ -35,7 +35,7 @@
namespace Fem
{
class AppFemExport FemMeshObject : public App::GeoFeature
class FemExport FemMeshObject : public App::GeoFeature
{
PROPERTY_HEADER(Fem::FemMeshObject);

View File

@@ -35,7 +35,7 @@ namespace Fem
/** The part shape property class.
* @author Werner Mayer
*/
class AppFemExport PropertyFemMesh : public App::PropertyComplexGeoData
class FemExport PropertyFemMesh : public App::PropertyComplexGeoData
{
TYPESYSTEM_HEADER();

View File

@@ -32,7 +32,7 @@
namespace Fem
{
class AppFemExport FemMeshShapeNetgenObject : public FemMeshShapeObject
class FemExport FemMeshShapeNetgenObject : public FemMeshShapeObject
{
PROPERTY_HEADER(Fem::FemMeshShapeNetgenObject);

View File

@@ -30,7 +30,7 @@
namespace Fem
{
class AppFemExport FemMeshShapeObject : public FemMeshObject
class FemExport FemMeshShapeObject : public FemMeshObject
{
PROPERTY_HEADER(Fem::FemMeshShapeObject);

View File

@@ -43,7 +43,7 @@
namespace Fem
{
class AppFemExport FemPostFilter : public Fem::FemPostObject
class FemExport FemPostFilter : public Fem::FemPostObject
{
PROPERTY_HEADER(Fem::FemPostFilter);
@@ -75,7 +75,7 @@ private:
std::string m_activePipeline;
};
class AppFemExport FemPostClipFilter : public FemPostFilter {
class FemExport FemPostClipFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostClipFilter);
@@ -101,7 +101,7 @@ private:
vtkSmartPointer<vtkExtractGeometry> m_extractor;
};
class AppFemExport FemPostDataAlongLineFilter : public FemPostFilter {
class FemExport FemPostDataAlongLineFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostDataAlongLineFilter);
@@ -133,7 +133,7 @@ private:
};
class AppFemExport FemPostDataAtPointFilter : public FemPostFilter {
class FemExport FemPostDataAtPointFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostDataAtPointFilter);
@@ -164,7 +164,7 @@ private:
};
class AppFemExport FemPostScalarClipFilter : public FemPostFilter {
class FemExport FemPostScalarClipFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostScalarClipFilter);
@@ -192,7 +192,7 @@ private:
App::PropertyFloatConstraint::Constraints m_constraints;
};
class AppFemExport FemPostWarpVectorFilter : public FemPostFilter {
class FemExport FemPostWarpVectorFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostWarpVectorFilter);
@@ -217,7 +217,7 @@ private:
App::Enumeration m_vectorFields;
};
class AppFemExport FemPostCutFilter : public FemPostFilter {
class FemExport FemPostCutFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostCutFilter);

View File

@@ -36,7 +36,7 @@
namespace Fem
{
class AppFemExport FemPostFunction : public App::DocumentObject
class FemExport FemPostFunction : public App::DocumentObject
{
PROPERTY_HEADER(Fem::FemPostFunction);
@@ -62,7 +62,7 @@ protected:
vtkBoundingBox m_boundingBox;
};
class AppFemExport FemPostFunctionProvider : public App::DocumentObject {
class FemExport FemPostFunctionProvider : public App::DocumentObject {
PROPERTY_HEADER(Fem::FemPostFunctionProvider);
@@ -83,7 +83,7 @@ protected:
// ---------------------------------------------------------------------------
class AppFemExport FemPostPlaneFunction : public FemPostFunction
class FemExport FemPostPlaneFunction : public FemPostFunction
{
PROPERTY_HEADER(Fem::FemPostPlaneFunction);
@@ -107,7 +107,7 @@ protected:
// ---------------------------------------------------------------------------
class AppFemExport FemPostSphereFunction : public FemPostFunction
class FemExport FemPostSphereFunction : public FemPostFunction
{
PROPERTY_HEADER(Fem::FemPostSphereFunction);

View File

@@ -33,7 +33,7 @@ namespace Fem
{
//poly data is the only data we can visualize, hence every post processing object needs to expose it
class AppFemExport FemPostObject : public App::GeoFeature
class FemExport FemPostObject : public App::GeoFeature
{
PROPERTY_HEADER(Fem::FemPostObject);

View File

@@ -35,7 +35,7 @@
namespace Fem
{
class AppFemExport FemPostPipeline : public Fem::FemPostFilter
class FemExport FemPostPipeline : public Fem::FemPostFilter
{
PROPERTY_HEADER(Fem::FemPostPipeline);

View File

@@ -86,6 +86,6 @@ template<> PyObject* Fem::FemResultObjectPython::getPyObject(void) {
}
// explicit template instantiation
template class AppFemExport FeaturePythonT<Fem::FemResultObject>;
template class FemExport FeaturePythonT<Fem::FemResultObject>;
}

View File

@@ -28,12 +28,12 @@
#include <App/PropertyUnits.h>
#include <App/PropertyStandard.h>
#include <App/FeaturePython.h>
#include "FemResultObject.h"
#include <Mod/Fem/FemGlobal.h>
namespace Fem
{
/// Father of all result data in a Fem Analysis
class AppFemExport FemResultObject : public App::DocumentObject
class FemExport FemResultObject : public App::DocumentObject
{
PROPERTY_HEADER(Fem::FemResultObject);

View File

@@ -31,7 +31,7 @@
namespace Fem
{
class AppFemExport FemSetElementsObject : public FemSetObject
class FemExport FemSetElementsObject : public FemSetObject
{
PROPERTY_HEADER(Fem::FemSetElementsObject);

View File

@@ -31,7 +31,7 @@
namespace Fem
{
class AppFemExport FemSetFacesObject : public FemSetObject
class FemExport FemSetFacesObject : public FemSetObject
{
PROPERTY_HEADER(Fem::FemSetFacesObject);

View File

@@ -31,7 +31,7 @@
namespace Fem
{
class AppFemExport FemSetGeometryObject : public FemSetObject
class FemExport FemSetGeometryObject : public FemSetObject
{
PROPERTY_HEADER(Fem::FemSetGeometryObject);

View File

@@ -31,7 +31,7 @@
namespace Fem
{
class AppFemExport FemSetNodesObject : public FemSetObject
class FemExport FemSetNodesObject : public FemSetObject
{
PROPERTY_HEADER(Fem::FemSetNodesObject);

View File

@@ -26,12 +26,12 @@
#include <App/DocumentObject.h>
#include <App/PropertyLinks.h>
#include "FemSetObject.h"
#include <Mod/Fem/FemGlobal.h>
namespace Fem
{
class AppFemExport FemSetObject : public App::DocumentObject
class FemExport FemSetObject : public App::DocumentObject
{
PROPERTY_HEADER(Fem::FemSetObject);

View File

@@ -79,6 +79,6 @@ template<> PyObject* Fem::FemSolverObjectPython::getPyObject(void) {
}
/// @endcond
// explicit template instantiation
template class AppFemExport FeaturePythonT<Fem::FemSolverObject>;
template class FemExport FeaturePythonT<Fem::FemSolverObject>;
}

View File

@@ -26,11 +26,12 @@
#define Fem_FemSolverObject_H
#include <App/FeaturePython.h>
#include <Mod/Fem/FemGlobal.h>
namespace Fem
{
/// Father of all result data in a Fem Analysis
class AppFemExport FemSolverObject : public App::DocumentObject
class FemExport FemSolverObject : public App::DocumentObject
{
PROPERTY_HEADER(Fem::FemSolverObject);

View File

@@ -26,6 +26,7 @@
#include <Base/Vector3D.h>
#include <gp_XYZ.hxx>
#include <Mod/Fem/FemGlobal.h>
class TopoDS_Shape;
class TopoDS_Edge;
@@ -34,7 +35,7 @@ class TopoDS_Face;
namespace Fem
{
class AppFemExport Tools
class FemExport Tools
{
public:
/*!

View File

@@ -39,7 +39,7 @@ namespace Fem
{
// utility class to import/export read/write vtk mesh and result
class AppFemExport FemVTKTools
class FemExport FemVTKTools
{
public:
// extract data from vtkUnstructuredGrid instance and fill a FreeCAD FEM mesh object with that data

View File

@@ -28,6 +28,7 @@
#include <vtkSmartPointer.h>
#include <vtkDataObject.h>
#include <vtkDataSet.h>
#include <Mod/Fem/FemGlobal.h>
namespace Fem
{

View File

@@ -26,6 +26,7 @@
#include <Gui/ViewProviderDocumentObjectGroup.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Mod/Fem/FemGlobal.h>
#include <QCoreApplication>
namespace FemGui

View File

@@ -27,6 +27,7 @@
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Mod/Fem/FemGlobal.h>
#include <QObject>
#include <QVBoxLayout>

View File

@@ -27,6 +27,7 @@
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/ViewProviderBuilder.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Mod/Fem/FemGlobal.h>
#include <CXX/Objects.hxx>

View File

@@ -28,6 +28,7 @@
#include <CXX/Objects.hxx>
#include <Base/Observer.h>
#include <Mod/Fem/FemGlobal.h>
#include <vtkSmartPointer.h>
#include <vtkPolyDataMapper.h>
#include <vtkOutlineFilter.h>

View File

@@ -26,6 +26,7 @@
#include <Gui/ViewProviderDocumentObject.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Mod/Fem/FemGlobal.h>
namespace FemGui
{

View File

@@ -27,6 +27,7 @@
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/ViewProviderBuilder.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Mod/Fem/FemGlobal.h>
class SoCoordinate3;
class SoDrawStyle;

View File

@@ -25,6 +25,7 @@
#define FEM_WORKBENCH_H
#include <Gui/Workbench.h>
#include <Mod/Fem/FemGlobal.h>
namespace FemGui {