kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Mod: redundant void 2

Browse Source
This commit is contained in:
berniev
2022-08-07 20:05:16 +10:00
committed by wwmayer
parent 311abcc43e
commit da9ebc572f
805 changed files with 3787 additions and 3787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Fem/App/FemAnalysis.cpp
View File

@@ -67,7 +67,7 @@ PROPERTY_SOURCE_ABSTRACT(Fem::DocumentObject, App::DocumentObject)
namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(Fem::FemAnalysisPython, Fem::FemAnalysis)
template<> const char* Fem::FemAnalysisPython::getViewProviderName(void) const {
template<> const char* Fem::FemAnalysisPython::getViewProviderName() const {
return "FemGui::ViewProviderFemAnalysisPython";
}
@@ -92,10 +92,10 @@ template class FemExport FeaturePythonT<Fem::FemAnalysis>;
namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(Fem::FeaturePython, Fem::DocumentObject)
template<> const char* Fem::FeaturePython::getViewProviderName(void) const {
template<> const char* Fem::FeaturePython::getViewProviderName() const {
return "Gui::ViewProviderPythonFeature";
}
template<> PyObject* Fem::FeaturePython::getPyObject(void) {
template<> PyObject* Fem::FeaturePython::getPyObject() {
if (PythonObject.is(Py::_None())) {
// ref counter is set to 1
PythonObject = Py::Object(new App::FeaturePythonPyT<App::DocumentObjectPy>(this), true);

6
src/Mod/Fem/App/FemConstraint.cpp
View File

@@ -92,7 +92,7 @@ Constraint::~Constraint()
{
}
App::DocumentObjectExecReturn *Constraint::execute(void)
App::DocumentObjectExecReturn *Constraint::execute()
{
try {
References.touch();
@@ -483,11 +483,11 @@ const Base::Vector3d Constraint::getDirection(const App::PropertyLinkSub &direct
namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(Fem::ConstraintPython, Fem::Constraint)
template<> const char* Fem::ConstraintPython::getViewProviderName(void) const {
template<> const char* Fem::ConstraintPython::getViewProviderName() const {
return "FemGui::ViewProviderFemConstraintPython";
}
template<> PyObject* Fem::ConstraintPython::getPyObject(void) {
template<> PyObject* Fem::ConstraintPython::getPyObject() {
if (PythonObject.is(Py::_None())) {
// ref counter is set to 1
PythonObject = Py::Object(new App::FeaturePythonPyT<App::DocumentObjectPy>(this),true);

2
src/Mod/Fem/App/FemConstraintBearing.cpp
View File

@@ -57,7 +57,7 @@ ConstraintBearing::ConstraintBearing()
"Axis of bearing seat");
}
App::DocumentObjectExecReturn *ConstraintBearing::execute(void)
App::DocumentObjectExecReturn *ConstraintBearing::execute()
{
return Constraint::execute();
}

6
src/Mod/Fem/App/FemConstraintBearing.h
View File

@@ -40,7 +40,7 @@ class FemExport ConstraintBearing : public Fem::Constraint
public:
/// Constructor
ConstraintBearing(void);
ConstraintBearing();
/// Location reference
App::PropertyLinkSub Location;
@@ -55,10 +55,10 @@ public:
App::PropertyVector Axis;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const {
const char* getViewProviderName() const {
return "FemGui::ViewProviderFemConstraintBearing";
}

4
src/Mod/Fem/App/FemConstraintContact.cpp
View File

@@ -55,12 +55,12 @@ ConstraintContact::ConstraintContact()
Normals.setValues(std::vector<Base::Vector3d>());
}
App::DocumentObjectExecReturn *ConstraintContact::execute(void)
App::DocumentObjectExecReturn *ConstraintContact::execute()
{
return Constraint::execute();
}
const char* ConstraintContact::getViewProviderName(void) const
const char* ConstraintContact::getViewProviderName() const
{
return "FemGui::ViewProviderFemConstraintContact";
}

6
src/Mod/Fem/App/FemConstraintContact.h
View File

@@ -36,7 +36,7 @@ class FemExport ConstraintContact : public Fem::Constraint
public:
/// Constructor
ConstraintContact(void);
ConstraintContact();
// Read-only (calculated values). These trigger changes in the ViewProvider
App::PropertyVectorList Points;
@@ -57,10 +57,10 @@ public:
/* */
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const;
const char* getViewProviderName() const;
protected:
virtual void onChanged(const App::Property* prop);

4
src/Mod/Fem/App/FemConstraintDisplacement.cpp
View File

@@ -88,12 +88,12 @@ ConstraintDisplacement::ConstraintDisplacement()
Normals.setValues(std::vector<Base::Vector3d>());
}
App::DocumentObjectExecReturn *ConstraintDisplacement::execute(void)
App::DocumentObjectExecReturn *ConstraintDisplacement::execute()
{
return Constraint::execute();
}
const char* ConstraintDisplacement::getViewProviderName(void) const
const char* ConstraintDisplacement::getViewProviderName() const
{
return "FemGui::ViewProviderFemConstraintDisplacement";
}

6
src/Mod/Fem/App/FemConstraintDisplacement.h
View File

@@ -38,7 +38,7 @@ class FemExport ConstraintDisplacement : public Fem::Constraint
public:
/// Constructor
ConstraintDisplacement(void);
ConstraintDisplacement();
// Read-only (calculated values). These trigger changes in the ViewProvider
App::PropertyVectorList Points;
@@ -66,10 +66,10 @@ public:
//App::PropertyBool element;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const;
const char* getViewProviderName() const;
protected:
virtual void onChanged(const App::Property* prop);

2
src/Mod/Fem/App/FemConstraintFixed.cpp
View File

@@ -60,7 +60,7 @@ ConstraintFixed::ConstraintFixed()
Normals.setValues(std::vector<Base::Vector3d>());
}
App::DocumentObjectExecReturn *ConstraintFixed::execute(void)
App::DocumentObjectExecReturn *ConstraintFixed::execute()
{
return Constraint::execute();
}

6
src/Mod/Fem/App/FemConstraintFixed.h
View File

@@ -39,17 +39,17 @@ class FemExport ConstraintFixed : public Fem::Constraint
public:
/// Constructor
ConstraintFixed(void);
ConstraintFixed();
// Read-only (calculated values). These trigger changes in the ViewProvider
App::PropertyVectorList Points;
App::PropertyVectorList Normals;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const {
const char* getViewProviderName() const {
return "FemGui::ViewProviderFemConstraintFixed";
}

2
src/Mod/Fem/App/FemConstraintFluidBoundary.cpp
View File

@@ -113,7 +113,7 @@ ConstraintFluidBoundary::ConstraintFluidBoundary()
Normals.setValues(std::vector<Base::Vector3d>());
}
App::DocumentObjectExecReturn *ConstraintFluidBoundary::execute(void)
App::DocumentObjectExecReturn *ConstraintFluidBoundary::execute()
{
return Constraint::execute();
}

6
src/Mod/Fem/App/FemConstraintFluidBoundary.h
View File

@@ -41,7 +41,7 @@ class FemExport ConstraintFluidBoundary: public Fem::Constraint
public:
/// Constructor
ConstraintFluidBoundary(void);
ConstraintFluidBoundary();
//
App::PropertyEnumeration BoundaryType;
App::PropertyEnumeration Subtype;
@@ -64,10 +64,10 @@ public:
App::PropertyVector DirectionVector;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const {
const char* getViewProviderName() const {
return "FemGui::ViewProviderFemConstraintFluidBoundary";
}

2
src/Mod/Fem/App/FemConstraintForce.cpp
View File

@@ -57,7 +57,7 @@ ConstraintForce::ConstraintForce()
Points.setValues(std::vector<Base::Vector3d>());
}
App::DocumentObjectExecReturn *ConstraintForce::execute(void)
App::DocumentObjectExecReturn *ConstraintForce::execute()
{
return Constraint::execute();
}

6
src/Mod/Fem/App/FemConstraintForce.h
View File

@@ -40,7 +40,7 @@ class FemExport ConstraintForce : public Fem::Constraint
public:
/// Constructor
ConstraintForce(void);
ConstraintForce();
App::PropertyFloat Force;
App::PropertyLinkSub Direction;
@@ -50,10 +50,10 @@ public:
App::PropertyVector DirectionVector;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const {
const char* getViewProviderName() const {
return "FemGui::ViewProviderFemConstraintForce";
}

2
src/Mod/Fem/App/FemConstraintGear.cpp
View File

@@ -56,7 +56,7 @@ ConstraintGear::ConstraintGear()
naturalDirectionVector = Base::Vector3d(1,1,1).Normalize();
}
App::DocumentObjectExecReturn *ConstraintGear::execute(void)
App::DocumentObjectExecReturn *ConstraintGear::execute()
{
return ConstraintBearing::execute();
}

6
src/Mod/Fem/App/FemConstraintGear.h
View File

@@ -40,7 +40,7 @@ class FemExport ConstraintGear : public Fem::ConstraintBearing
public:
/// Constructor
ConstraintGear(void);
ConstraintGear();
App::PropertyFloat Diameter;
App::PropertyFloat Force;
@@ -51,10 +51,10 @@ public:
App::PropertyVector DirectionVector;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const {
const char* getViewProviderName() const {
return "FemGui::ViewProviderFemConstraintGear";
}

4
src/Mod/Fem/App/FemConstraintHeatflux.cpp
View File

@@ -61,12 +61,12 @@ ConstraintHeatflux::ConstraintHeatflux()
Normals.setValues(std::vector<Base::Vector3d>());
}
App::DocumentObjectExecReturn *ConstraintHeatflux::execute(void)
App::DocumentObjectExecReturn *ConstraintHeatflux::execute()
{
return Constraint::execute();
}
const char* ConstraintHeatflux::getViewProviderName(void) const
const char* ConstraintHeatflux::getViewProviderName() const
{
return "FemGui::ViewProviderFemConstraintHeatflux";
}

6
src/Mod/Fem/App/FemConstraintHeatflux.h
View File

@@ -36,7 +36,7 @@ class FemExport ConstraintHeatflux : public Fem::Constraint
PROPERTY_HEADER(Fem::ConstraintHeatflux);
public:
ConstraintHeatflux(void);
ConstraintHeatflux();
App::PropertyFloat AmbientTemp;
/*App::PropertyFloat FaceTemp;*/
@@ -48,10 +48,10 @@ public:
App::PropertyVectorList Normals;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const;
const char* getViewProviderName() const;
protected:
virtual void onChanged(const App::Property* prop);

4
src/Mod/Fem/App/FemConstraintInitialTemperature.cpp
View File

@@ -57,12 +57,12 @@ ConstraintInitialTemperature::ConstraintInitialTemperature()
References.setStatus(App::Property::Hidden, true);
}
App::DocumentObjectExecReturn *ConstraintInitialTemperature::execute(void)
App::DocumentObjectExecReturn *ConstraintInitialTemperature::execute()
{
return Constraint::execute();
}
const char* ConstraintInitialTemperature::getViewProviderName(void) const
const char* ConstraintInitialTemperature::getViewProviderName() const
{
return "FemGui::ViewProviderFemConstraintInitialTemperature";
}

6
src/Mod/Fem/App/FemConstraintInitialTemperature.h
View File

@@ -38,7 +38,7 @@ class FemExport ConstraintInitialTemperature : public Fem::Constraint
public:
/// Constructor
ConstraintInitialTemperature(void);
ConstraintInitialTemperature();
// Read-only (calculated values). These trigger changes in the ViewProvider
App::PropertyVectorList Points;
@@ -49,10 +49,10 @@ public:
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const;
const char* getViewProviderName() const;
protected:
virtual void onChanged(const App::Property* prop);

4
src/Mod/Fem/App/FemConstraintPlaneRotation.cpp
View File

@@ -51,12 +51,12 @@ ConstraintPlaneRotation::ConstraintPlaneRotation()
Normals.setValues(std::vector<Base::Vector3d>());
}
App::DocumentObjectExecReturn *ConstraintPlaneRotation::execute(void)
App::DocumentObjectExecReturn *ConstraintPlaneRotation::execute()
{
return Constraint::execute();
}
const char* ConstraintPlaneRotation::getViewProviderName(void) const
const char* ConstraintPlaneRotation::getViewProviderName() const
{
return "FemGui::ViewProviderFemConstraintPlaneRotation";
}

6
src/Mod/Fem/App/FemConstraintPlaneRotation.h
View File

@@ -36,7 +36,7 @@ class FemExport ConstraintPlaneRotation : public Fem::Constraint
public:
/// Constructor
ConstraintPlaneRotation(void);
ConstraintPlaneRotation();
// Read-only (calculated values). These trigger changes in the ViewProvider
App::PropertyVectorList Points;
@@ -44,10 +44,10 @@ public:
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const;
const char* getViewProviderName() const;
protected:
virtual void onChanged(const App::Property* prop);

4
src/Mod/Fem/App/FemConstraintPressure.cpp
View File

@@ -53,12 +53,12 @@ ConstraintPressure::ConstraintPressure()
Normals.setValues(std::vector<Base::Vector3d>());
}
App::DocumentObjectExecReturn *ConstraintPressure::execute(void)
App::DocumentObjectExecReturn *ConstraintPressure::execute()
{
return Constraint::execute();
}
const char* ConstraintPressure::getViewProviderName(void) const
const char* ConstraintPressure::getViewProviderName() const
{
return "FemGui::ViewProviderFemConstraintPressure";
}

6
src/Mod/Fem/App/FemConstraintPressure.h
View File

@@ -34,7 +34,7 @@ class FemExport ConstraintPressure : public Fem::Constraint
PROPERTY_HEADER(Fem::ConstraintPressure);
public:
ConstraintPressure(void);
ConstraintPressure();
App::PropertyFloat Pressure;
App::PropertyBool Reversed;
@@ -42,10 +42,10 @@ public:
App::PropertyVectorList Normals;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const;
const char* getViewProviderName() const;
protected:
virtual void onChanged(const App::Property* prop);

2
src/Mod/Fem/App/FemConstraintPulley.cpp
View File

@@ -62,7 +62,7 @@ ConstraintPulley::ConstraintPulley()
onChanged(&Force);
}
App::DocumentObjectExecReturn *ConstraintPulley::execute(void)
App::DocumentObjectExecReturn *ConstraintPulley::execute()
{
return ConstraintGear::execute();
}

6
src/Mod/Fem/App/FemConstraintPulley.h
View File

@@ -39,7 +39,7 @@ class FemExport ConstraintPulley : public Fem::ConstraintGear
public:
/// Constructor
ConstraintPulley(void);
ConstraintPulley();
/// Other pulley diameter
App::PropertyFloat OtherDiameter;
@@ -55,10 +55,10 @@ public:
App::PropertyFloat BeltForce2;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const {
const char* getViewProviderName() const {
return "FemGui::ViewProviderFemConstraintPulley";
}

4
src/Mod/Fem/App/FemConstraintSpring.cpp
View File

@@ -53,12 +53,12 @@ ConstraintSpring::ConstraintSpring()
Normals.setValues(std::vector<Base::Vector3d>());
}
App::DocumentObjectExecReturn *ConstraintSpring::execute(void)
App::DocumentObjectExecReturn *ConstraintSpring::execute()
{
return Constraint::execute();
}
const char* ConstraintSpring::getViewProviderName(void) const
const char* ConstraintSpring::getViewProviderName() const
{
return "FemGui::ViewProviderFemConstraintSpring";
}

6
src/Mod/Fem/App/FemConstraintSpring.h
View File

@@ -34,7 +34,7 @@ class FemExport ConstraintSpring : public Fem::Constraint
PROPERTY_HEADER(Fem::ConstraintSpring);
public:
ConstraintSpring(void);
ConstraintSpring();
App::PropertyFloat normalStiffness;
App::PropertyFloat tangentialStiffness;
@@ -42,10 +42,10 @@ public:
App::PropertyVectorList Normals;
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const;
const char* getViewProviderName() const;
protected:
virtual void onChanged(const App::Property* prop);

4
src/Mod/Fem/App/FemConstraintTemperature.cpp
View File

@@ -60,12 +60,12 @@ ConstraintTemperature::ConstraintTemperature()
Normals.setValues(std::vector<Base::Vector3d>());
}
App::DocumentObjectExecReturn *ConstraintTemperature::execute(void)
App::DocumentObjectExecReturn *ConstraintTemperature::execute()
{
return Constraint::execute();
}
const char* ConstraintTemperature::getViewProviderName(void) const
const char* ConstraintTemperature::getViewProviderName() const
{
return "FemGui::ViewProviderFemConstraintTemperature";
}

6
src/Mod/Fem/App/FemConstraintTemperature.h
View File

@@ -38,7 +38,7 @@ class FemExport ConstraintTemperature : public Fem::Constraint
public:
/// Constructor
ConstraintTemperature(void);
ConstraintTemperature();
// Read-only (calculated values). These trigger changes in the ViewProvider
App::PropertyVectorList Points;
@@ -51,10 +51,10 @@ public:
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const;
const char* getViewProviderName() const;
protected:
virtual void onChanged(const App::Property* prop);

4
src/Mod/Fem/App/FemConstraintTransform.cpp
View File

@@ -64,12 +64,12 @@ ConstraintTransform::ConstraintTransform()
Normals.setValues(std::vector<Base::Vector3d>());
}
App::DocumentObjectExecReturn *ConstraintTransform::execute(void)
App::DocumentObjectExecReturn *ConstraintTransform::execute()
{
return Constraint::execute();
}
const char* ConstraintTransform::getViewProviderName(void) const
const char* ConstraintTransform::getViewProviderName() const
{
return "FemGui::ViewProviderFemConstraintTransform";
}

6
src/Mod/Fem/App/FemConstraintTransform.h
View File

@@ -35,7 +35,7 @@ class FemExport ConstraintTransform : public Fem::Constraint
public:
/// Constructor
ConstraintTransform(void);
ConstraintTransform();
// Read-only (calculated values). These trigger changes in the ViewProvider
App::PropertyLinkSubList RefDispl;
@@ -52,10 +52,10 @@ public:
/* */
/// recalculate the object
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
/// returns the type name of the ViewProvider
const char* getViewProviderName(void) const;
const char* getViewProviderName() const;
protected:
virtual void onChanged(const App::Property* prop);

16
src/Mod/Fem/App/FemMesh.cpp
View File

@@ -1055,7 +1055,7 @@ std::list<int> FemMesh::getElementNodes(int id) const
return result;
}
std::set<int> FemMesh::getEdgesOnly(void) const
std::set<int> FemMesh::getEdgesOnly() const
{
std::set<int> resultIDs;
@@ -1092,7 +1092,7 @@ std::set<int> FemMesh::getEdgesOnly(void) const
return resultIDs;
}
std::set<int> FemMesh::getFacesOnly(void) const
std::set<int> FemMesh::getFacesOnly() const
{
// How it works ATM:
// for each face
@@ -2365,7 +2365,7 @@ void FemMesh::write(const char *FileName) const
// ==== Base class implementer ==============================================================
unsigned int FemMesh::getMemSize (void) const
unsigned int FemMesh::getMemSize () const
{
return 0;
}
@@ -2480,12 +2480,12 @@ void FemMesh::setTransform(const Base::Matrix4D& rclTrf)
_Mtrx = rclTrf;
}
Base::Matrix4D FemMesh::getTransform(void) const
Base::Matrix4D FemMesh::getTransform() const
{
return _Mtrx;
}
Base::BoundBox3d FemMesh::getBoundBox(void) const
Base::BoundBox3d FemMesh::getBoundBox() const
{
Base::BoundBox3d box;
@@ -2503,7 +2503,7 @@ Base::BoundBox3d FemMesh::getBoundBox(void) const
return box;
}
std::vector<const char*> FemMesh::getElementTypes(void) const
std::vector<const char*> FemMesh::getElementTypes() const
{
std::vector<const char*> temp;
temp.push_back("Vertex");
@@ -2529,7 +2529,7 @@ Data::Segment* FemMesh::getSubElement(const char* /*Type*/, unsigned long /*n*/)
return nullptr;
}
struct Fem::FemMesh::FemMeshInfo FemMesh::getInfo(void) const{
struct Fem::FemMesh::FemMeshInfo FemMesh::getInfo() const{
struct FemMeshInfo rtrn;
@@ -2570,7 +2570,7 @@ struct Fem::FemMesh::FemMeshInfo FemMesh::getInfo(void) const{
// );
// }
Base::Quantity FemMesh::getVolume(void)const
Base::Quantity FemMesh::getVolume()const
{
SMDS_VolumeIteratorPtr aVolIter = myMesh->GetMeshDS()->volumesIterator();

16
src/Mod/Fem/App/FemMesh.h
View File

@@ -67,7 +67,7 @@ public:
void compute();
// from base class
virtual unsigned int getMemSize (void) const;
virtual unsigned int getMemSize () const;
virtual void Save (Base::Writer &/*writer*/) const;
virtual void Restore(Base::XMLReader &/*reader*/);
void SaveDocFile (Base::Writer &writer) const;
@@ -79,7 +79,7 @@ public:
* List of different subelement types
* it is NOT a list of the subelements itself
*/
virtual std::vector<const char*> getElementTypes(void) const;
virtual std::vector<const char*> getElementTypes() const;
virtual unsigned long countSubElements(const char* Type) const;
/// get the subelement by type and number
virtual Data::Segment* getSubElement(const char* Type, unsigned long) const;
@@ -108,9 +108,9 @@ public:
/// retrieving volume IDs and CalculiX face number by face
std::map<int, int> getccxVolumesByFace(const TopoDS_Face &face) const;
/// retrieving IDs of edges not belonging to any face (and thus not belonging to any volume too)
std::set<int> getEdgesOnly(void) const;
std::set<int> getEdgesOnly() const;
/// retrieving IDs of faces not belonging to any volume
std::set<int> getFacesOnly(void) const;
std::set<int> getFacesOnly() const;
//@}
/** @name Placement control */
@@ -118,11 +118,11 @@ public:
/// set the transformation
void setTransform(const Base::Matrix4D& rclTrf);
/// get the transformation
Base::Matrix4D getTransform(void) const;
Base::Matrix4D getTransform() const;
/// Bound box from the shape
Base::BoundBox3d getBoundBox(void)const;
Base::BoundBox3d getBoundBox()const;
/// get the volume (when there are volume elements)
Base::Quantity getVolume(void)const;
Base::Quantity getVolume()const;
//@}
/** @name Modification */
@@ -157,7 +157,7 @@ public:
};
///
struct FemMeshInfo getInfo(void) const;
struct FemMeshInfo getInfo() const;
/// import from files
void read(const char *FileName);

6
src/Mod/Fem/App/FemMeshObject.cpp
View File

@@ -45,7 +45,7 @@ FemMeshObject::~FemMeshObject()
{
}
short FemMeshObject::mustExecute(void) const
short FemMeshObject::mustExecute() const
{
return 0;
}
@@ -75,11 +75,11 @@ void FemMeshObject::onChanged(const Property* prop)
namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(Fem::FemMeshObjectPython, Fem::FemMeshObject)
template<> const char* Fem::FemMeshObjectPython::getViewProviderName(void) const {
template<> const char* Fem::FemMeshObjectPython::getViewProviderName() const {
return "FemGui::ViewProviderFemMeshPython";
}
template<> PyObject* Fem::FemMeshObjectPython::getPyObject(void) {
template<> PyObject* Fem::FemMeshObjectPython::getPyObject() {
if (PythonObject.is(Py::_None())) {
// ref counter is set to 1
PythonObject = Py::Object(new App::FeaturePythonPyT<App::DocumentObjectPy>(this), true);

10
src/Mod/Fem/App/FemMeshObject.h
View File

@@ -39,18 +39,18 @@ class FemExport FemMeshObject : public App::GeoFeature
public:
/// Constructor
FemMeshObject(void);
FemMeshObject();
virtual ~FemMeshObject();
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemMesh";
}
virtual App::DocumentObjectExecReturn *execute(void) {
virtual App::DocumentObjectExecReturn *execute() {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute(void) const;
virtual PyObject *getPyObject(void);
virtual short mustExecute() const;
virtual PyObject *getPyObject();
PropertyFemMesh FemMesh;

8
src/Mod/Fem/App/FemMeshProperty.cpp
View File

@@ -67,7 +67,7 @@ void PropertyFemMesh::setValue(const FemMesh& sh)
hasSetValue();
}
const FemMesh &PropertyFemMesh::getValue(void)const
const FemMesh &PropertyFemMesh::getValue()const
{
return *_FemMesh;
}
@@ -99,7 +99,7 @@ void PropertyFemMesh::transformGeometry(const Base::Matrix4D &rclMat)
hasSetValue();
}
PyObject *PropertyFemMesh::getPyObject(void)
PyObject *PropertyFemMesh::getPyObject()
{
FemMeshPy* mesh = new FemMeshPy(&*_FemMesh);
mesh->setConst();
@@ -123,7 +123,7 @@ void PropertyFemMesh::setPyObject(PyObject *value)
}
}
App::Property *PropertyFemMesh::Copy(void) const
App::Property *PropertyFemMesh::Copy() const
{
PropertyFemMesh *prop = new PropertyFemMesh();
prop->_FemMesh = this->_FemMesh;
@@ -137,7 +137,7 @@ void PropertyFemMesh::Paste(const App::Property &from)
hasSetValue();
}
unsigned int PropertyFemMesh::getMemSize (void) const
unsigned int PropertyFemMesh::getMemSize () const
{
return _FemMesh->getMemSize();
}

12
src/Mod/Fem/App/FemMeshProperty.h
View File

@@ -49,9 +49,9 @@ public:
/// set the FemMesh shape
void setValue(const FemMesh&);
/// does nothing, for add property macro
void setValue(void){}
void setValue(){}
/// get the FemMesh shape
const FemMesh &getValue(void) const;
const FemMesh &getValue() const;
const Data::ComplexGeoData* getComplexData() const;
//@}
@@ -69,7 +69,7 @@ public:
/** @name Python interface */
//@{
PyObject* getPyObject(void);
PyObject* getPyObject();
void setPyObject(PyObject *value);
//@}
@@ -80,10 +80,10 @@ public:
void SaveDocFile (Base::Writer &writer) const;
void RestoreDocFile(Base::Reader &reader);
App::Property *Copy(void) const;
App::Property *Copy() const;
void Paste(const App::Property &from);
unsigned int getMemSize (void) const;
const char* getEditorName(void) const { return "FemGui::PropertyFemMeshItem"; }
unsigned int getMemSize () const;
const char* getEditorName() const { return "FemGui::PropertyFemMeshItem"; }
//@}
private:

46
src/Mod/Fem/App/FemMeshPyImp.cpp
View File

@@ -63,7 +63,7 @@
using namespace Fem;
// returns a string which represents the object e.g. when printed in python
std::string FemMeshPy::representation(void) const
std::string FemMeshPy::representation() const
{
std::stringstream str;
getFemMeshPtr()->getSMesh()->Dump(str);
@@ -1160,7 +1160,7 @@ PyObject* FemMeshPy::getIdByElementType(PyObject *args)
// ===== Attributes ============================================================
Py::Dict FemMeshPy::getNodes(void) const
Py::Dict FemMeshPy::getNodes() const
{
//int count = getFemMeshPtr()->getSMesh()->GetMeshDS()->NbNodes();
//Py::Tuple tup(count);
@@ -1183,12 +1183,12 @@ Py::Dict FemMeshPy::getNodes(void) const
return dict;
}
Py::Long FemMeshPy::getNodeCount(void) const
Py::Long FemMeshPy::getNodeCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbNodes());
}
Py::Tuple FemMeshPy::getEdges(void) const
Py::Tuple FemMeshPy::getEdges() const
{
std::set<int> ids;
SMDS_EdgeIteratorPtr aEdgeIter = getFemMeshPtr()->getSMesh()->GetMeshDS()->edgesIterator();
@@ -1206,7 +1206,7 @@ Py::Tuple FemMeshPy::getEdges(void) const
return tuple;
}
Py::Tuple FemMeshPy::getEdgesOnly(void) const
Py::Tuple FemMeshPy::getEdgesOnly() const
{
std::set<int> resultSet = getFemMeshPtr()->getEdgesOnly();
Py::Tuple tuple(resultSet.size());
@@ -1218,12 +1218,12 @@ Py::Tuple FemMeshPy::getEdgesOnly(void) const
return tuple;
}
Py::Long FemMeshPy::getEdgeCount(void) const
Py::Long FemMeshPy::getEdgeCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbEdges());
}
Py::Tuple FemMeshPy::getFaces(void) const
Py::Tuple FemMeshPy::getFaces() const
{
std::set<int> ids;
SMDS_FaceIteratorPtr aFaceIter = getFemMeshPtr()->getSMesh()->GetMeshDS()->facesIterator();
@@ -1241,7 +1241,7 @@ Py::Tuple FemMeshPy::getFaces(void) const
return tuple;
}
Py::Tuple FemMeshPy::getFacesOnly(void) const
Py::Tuple FemMeshPy::getFacesOnly() const
{
std::set<int> resultSet = getFemMeshPtr()->getFacesOnly();
Py::Tuple tuple(resultSet.size());
@@ -1253,27 +1253,27 @@ Py::Tuple FemMeshPy::getFacesOnly(void) const
return tuple;
}
Py::Long FemMeshPy::getFaceCount(void) const
Py::Long FemMeshPy::getFaceCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbFaces());
}
Py::Long FemMeshPy::getTriangleCount(void) const
Py::Long FemMeshPy::getTriangleCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbTriangles());
}
Py::Long FemMeshPy::getQuadrangleCount(void) const
Py::Long FemMeshPy::getQuadrangleCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbQuadrangles());
}
Py::Long FemMeshPy::getPolygonCount(void) const
Py::Long FemMeshPy::getPolygonCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbPolygons());
}
Py::Tuple FemMeshPy::getVolumes(void) const
Py::Tuple FemMeshPy::getVolumes() const
{
std::set<int> ids;
SMDS_VolumeIteratorPtr aVolIter = getFemMeshPtr()->getSMesh()->GetMeshDS()->volumesIterator();
@@ -1291,47 +1291,47 @@ Py::Tuple FemMeshPy::getVolumes(void) const
return tuple;
}
Py::Long FemMeshPy::getVolumeCount(void) const
Py::Long FemMeshPy::getVolumeCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbVolumes());
}
Py::Long FemMeshPy::getTetraCount(void) const
Py::Long FemMeshPy::getTetraCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbTetras());
}
Py::Long FemMeshPy::getHexaCount(void) const
Py::Long FemMeshPy::getHexaCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbHexas());
}
Py::Long FemMeshPy::getPyramidCount(void) const
Py::Long FemMeshPy::getPyramidCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbPyramids());
}
Py::Long FemMeshPy::getPrismCount(void) const
Py::Long FemMeshPy::getPrismCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbPrisms());
}
Py::Long FemMeshPy::getPolyhedronCount(void) const
Py::Long FemMeshPy::getPolyhedronCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbPolyhedrons());
}
Py::Long FemMeshPy::getSubMeshCount(void) const
Py::Long FemMeshPy::getSubMeshCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbSubMesh());
}
Py::Long FemMeshPy::getGroupCount(void) const
Py::Long FemMeshPy::getGroupCount() const
{
return Py::Long(getFemMeshPtr()->getSMesh()->NbGroup());
}
Py::Tuple FemMeshPy::getGroups(void) const
Py::Tuple FemMeshPy::getGroups() const
{
std::list<int> groupIDs = getFemMeshPtr()->getSMesh()->GetGroupIds();
@@ -1344,7 +1344,7 @@ Py::Tuple FemMeshPy::getGroups(void) const
return tuple;
}
Py::Object FemMeshPy::getVolume(void) const
Py::Object FemMeshPy::getVolume() const
{
return Py::asObject(new Base::QuantityPy(new Base::Quantity(getFemMeshPtr()->getVolume())));

2
src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp
View File

@@ -73,7 +73,7 @@ FemMeshShapeNetgenObject::~FemMeshShapeNetgenObject()
{
}
App::DocumentObjectExecReturn *FemMeshShapeNetgenObject::execute(void)
App::DocumentObjectExecReturn *FemMeshShapeNetgenObject::execute()
{
#ifdef FCWithNetgen

6
src/Mod/Fem/App/FemMeshShapeNetgenObject.h
View File

@@ -35,7 +35,7 @@ class FemExport FemMeshShapeNetgenObject : public FemMeshShapeObject
public:
/// Constructor
FemMeshShapeNetgenObject(void);
FemMeshShapeNetgenObject();
virtual ~FemMeshShapeNetgenObject();
App::PropertyFloat MaxSize;
@@ -47,10 +47,10 @@ public:
App::PropertyBool Optimize;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemMeshShapeNetgen";
}
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
//virtual short mustExecute(void) const;
//virtual PyObject *getPyObject(void);

2
src/Mod/Fem/App/FemMeshShapeObject.cpp
View File

@@ -86,7 +86,7 @@ FemMeshShapeObject::~FemMeshShapeObject()
{
}
App::DocumentObjectExecReturn *FemMeshShapeObject::execute(void)
App::DocumentObjectExecReturn *FemMeshShapeObject::execute()
{
Fem::FemMesh newMesh;

6
src/Mod/Fem/App/FemMeshShapeObject.h
View File

@@ -36,14 +36,14 @@ class FemExport FemMeshShapeObject : public FemMeshObject
public:
/// Constructor
FemMeshShapeObject(void);
FemMeshShapeObject();
virtual ~FemMeshShapeObject();
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemMeshShape";
}
virtual App::DocumentObjectExecReturn *execute(void);
virtual App::DocumentObjectExecReturn *execute();
//virtual short mustExecute(void) const;
//virtual PyObject *getPyObject(void);

38
src/Mod/Fem/App/FemPostFilter.cpp
View File

@@ -63,7 +63,7 @@ void FemPostFilter::setActiveFilterPipeline(std::string name) {
}
}
DocumentObjectExecReturn* FemPostFilter::execute(void) {
DocumentObjectExecReturn* FemPostFilter::execute() {
if (!m_pipelines.empty() && !m_activePipeline.empty()) {
FemPostFilter::FilterPipeline& pipe = m_pipelines[m_activePipeline];
@@ -112,7 +112,7 @@ vtkDataObject* FemPostFilter::getInputData() {
// clip filter
PROPERTY_SOURCE(Fem::FemPostClipFilter, Fem::FemPostFilter)
FemPostClipFilter::FemPostClipFilter(void) : FemPostFilter() {
FemPostClipFilter::FemPostClipFilter() : FemPostFilter() {
ADD_PROPERTY_TYPE(Function, (nullptr), "Clip", App::Prop_None, "The function object which defines the clip regions");
ADD_PROPERTY_TYPE(InsideOut, (false), "Clip", App::Prop_None, "Invert the clip direction");
@@ -163,7 +163,7 @@ void FemPostClipFilter::onChanged(const Property* prop) {
Fem::FemPostFilter::onChanged(prop);
}
short int FemPostClipFilter::mustExecute(void) const {
short int FemPostClipFilter::mustExecute() const {
if (Function.isTouched() ||
InsideOut.isTouched() ||
@@ -174,7 +174,7 @@ short int FemPostClipFilter::mustExecute(void) const {
else return App::DocumentObject::mustExecute();
}
DocumentObjectExecReturn* FemPostClipFilter::execute(void) {
DocumentObjectExecReturn* FemPostClipFilter::execute() {
if (!m_extractor->GetImplicitFunction())
return StdReturn;
@@ -187,7 +187,7 @@ DocumentObjectExecReturn* FemPostClipFilter::execute(void) {
// data along a line
PROPERTY_SOURCE(Fem::FemPostDataAlongLineFilter, Fem::FemPostFilter)
FemPostDataAlongLineFilter::FemPostDataAlongLineFilter(void) : FemPostFilter() {
FemPostDataAlongLineFilter::FemPostDataAlongLineFilter() : FemPostFilter() {
ADD_PROPERTY_TYPE(Point1, (Base::Vector3d(0.0, 0.0, 0.0)), "DataAlongLine", App::Prop_None, "The point 1 used to define end point of line");
ADD_PROPERTY_TYPE(Point2, (Base::Vector3d(0.0, 0.0, 1.0)), "DataAlongLine", App::Prop_None, "The point 2 used to define end point of line");
@@ -232,7 +232,7 @@ FemPostDataAlongLineFilter::~FemPostDataAlongLineFilter() {
}
DocumentObjectExecReturn* FemPostDataAlongLineFilter::execute(void) {
DocumentObjectExecReturn* FemPostDataAlongLineFilter::execute() {
//recalculate the filter
return Fem::FemPostFilter::execute();
@@ -274,7 +274,7 @@ void FemPostDataAlongLineFilter::onChanged(const Property* prop) {
Fem::FemPostFilter::onChanged(prop);
}
short int FemPostDataAlongLineFilter::mustExecute(void) const {
short int FemPostDataAlongLineFilter::mustExecute() const {
if (Point1.isTouched() ||
Point2.isTouched() ||
@@ -334,7 +334,7 @@ void FemPostDataAlongLineFilter::GetAxisData() {
// data point filter
PROPERTY_SOURCE(Fem::FemPostDataAtPointFilter, Fem::FemPostFilter)
FemPostDataAtPointFilter::FemPostDataAtPointFilter(void) : FemPostFilter() {
FemPostDataAtPointFilter::FemPostDataAtPointFilter() : FemPostFilter() {
ADD_PROPERTY_TYPE(Center, (Base::Vector3d(0.0, 0.0, 0.0)), "DataAtPoint", App::Prop_None, "Center of the point");
ADD_PROPERTY_TYPE(Radius, (0), "DataAtPoint", App::Prop_None, "Radius around the point (unused)");
@@ -375,7 +375,7 @@ FemPostDataAtPointFilter::~FemPostDataAtPointFilter() {
}
DocumentObjectExecReturn* FemPostDataAtPointFilter::execute(void) {
DocumentObjectExecReturn* FemPostDataAtPointFilter::execute() {
//recalculate the filter
return Fem::FemPostFilter::execute();
@@ -390,7 +390,7 @@ void FemPostDataAtPointFilter::onChanged(const Property* prop) {
Fem::FemPostFilter::onChanged(prop);
}
short int FemPostDataAtPointFilter::mustExecute(void) const {
short int FemPostDataAtPointFilter::mustExecute() const {
if (Center.isTouched())
return 1;
@@ -433,7 +433,7 @@ void FemPostDataAtPointFilter::GetPointData() {
// scalar clip filter
PROPERTY_SOURCE(Fem::FemPostScalarClipFilter, Fem::FemPostFilter)
FemPostScalarClipFilter::FemPostScalarClipFilter(void) : FemPostFilter() {
FemPostScalarClipFilter::FemPostScalarClipFilter() : FemPostFilter() {
ADD_PROPERTY_TYPE(Value, (0), "Clip", App::Prop_None, "The scalar value used to clip the selected field");
ADD_PROPERTY_TYPE(Scalars, (long(0)), "Clip", App::Prop_None, "The field used to clip");
@@ -453,7 +453,7 @@ FemPostScalarClipFilter::~FemPostScalarClipFilter() {
}
DocumentObjectExecReturn* FemPostScalarClipFilter::execute(void) {
DocumentObjectExecReturn* FemPostScalarClipFilter::execute() {
std::string val;
if (Scalars.getValue() >= 0)
@@ -506,7 +506,7 @@ void FemPostScalarClipFilter::onChanged(const Property* prop) {
Fem::FemPostFilter::onChanged(prop);
}
short int FemPostScalarClipFilter::mustExecute(void) const {
short int FemPostScalarClipFilter::mustExecute() const {
if (Value.isTouched() ||
InsideOut.isTouched() ||
@@ -541,7 +541,7 @@ void FemPostScalarClipFilter::setConstraintForField() {
// warp vector filter
PROPERTY_SOURCE(Fem::FemPostWarpVectorFilter, Fem::FemPostFilter)
FemPostWarpVectorFilter::FemPostWarpVectorFilter(void) : FemPostFilter() {
FemPostWarpVectorFilter::FemPostWarpVectorFilter() : FemPostFilter() {
ADD_PROPERTY_TYPE(Factor, (0), "Warp", App::Prop_None, "The factor by which the vector is added to the node positions");
ADD_PROPERTY_TYPE(Vector, (long(0)), "Warp", App::Prop_None, "The field added to the node position");
@@ -558,7 +558,7 @@ FemPostWarpVectorFilter::~FemPostWarpVectorFilter() {
}
DocumentObjectExecReturn* FemPostWarpVectorFilter::execute(void) {
DocumentObjectExecReturn* FemPostWarpVectorFilter::execute() {
std::string val;
if (Vector.getValue() >= 0)
@@ -605,7 +605,7 @@ void FemPostWarpVectorFilter::onChanged(const Property* prop) {
Fem::FemPostFilter::onChanged(prop);
}
short int FemPostWarpVectorFilter::mustExecute(void) const {
short int FemPostWarpVectorFilter::mustExecute() const {
if (Factor.isTouched() ||
Vector.isTouched())
@@ -619,7 +619,7 @@ short int FemPostWarpVectorFilter::mustExecute(void) const {
// cut filter
PROPERTY_SOURCE(Fem::FemPostCutFilter, Fem::FemPostFilter)
FemPostCutFilter::FemPostCutFilter(void) : FemPostFilter() {
FemPostCutFilter::FemPostCutFilter() : FemPostFilter() {
ADD_PROPERTY_TYPE(Function, (nullptr), "Cut", App::Prop_None, "The function object which defines the clip cut function");
@@ -647,7 +647,7 @@ void FemPostCutFilter::onChanged(const Property* prop) {
Fem::FemPostFilter::onChanged(prop);
}
short int FemPostCutFilter::mustExecute(void) const {
short int FemPostCutFilter::mustExecute() const {
if (Function.isTouched()) {
@@ -656,7 +656,7 @@ short int FemPostCutFilter::mustExecute(void) const {
else return App::DocumentObject::mustExecute();
}
DocumentObjectExecReturn* FemPostCutFilter::execute(void) {
DocumentObjectExecReturn* FemPostCutFilter::execute() {
if (!m_cutter->GetCutFunction())
return StdReturn;

52
src/Mod/Fem/App/FemPostFilter.h
View File

@@ -46,12 +46,12 @@ class FemExport FemPostFilter : public Fem::FemPostObject
public:
/// Constructor
FemPostFilter(void);
FemPostFilter();
virtual ~FemPostFilter();
App::PropertyLink Input;
virtual App::DocumentObjectExecReturn* execute(void);
virtual App::DocumentObjectExecReturn* execute();
protected:
vtkDataObject* getInputData();
@@ -77,18 +77,18 @@ class FemExport FemPostClipFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostClipFilter);
public:
FemPostClipFilter(void);
FemPostClipFilter();
virtual ~FemPostClipFilter();
App::PropertyLink Function;
App::PropertyBool InsideOut;
App::PropertyBool CutCells;
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemPostClip";
}
virtual short int mustExecute(void) const;
virtual App::DocumentObjectExecReturn* execute(void);
virtual short int mustExecute() const;
virtual App::DocumentObjectExecReturn* execute();
protected:
virtual void onChanged(const App::Property* prop);
@@ -103,7 +103,7 @@ class FemExport FemPostDataAlongLineFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostDataAlongLineFilter);
public:
FemPostDataAlongLineFilter(void);
FemPostDataAlongLineFilter();
virtual ~FemPostDataAlongLineFilter();
App::PropertyVectorDistance Point1;
@@ -113,14 +113,14 @@ public:
App::PropertyFloatList YAxisData;
App::PropertyString PlotData;
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemPostDataAlongLine";
}
virtual short int mustExecute(void) const;
virtual short int mustExecute() const;
void GetAxisData();
protected:
virtual App::DocumentObjectExecReturn* execute(void);
virtual App::DocumentObjectExecReturn* execute();
virtual void onChanged(const App::Property* prop);
virtual void handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName, App::Property* prop);
@@ -136,7 +136,7 @@ class FemExport FemPostDataAtPointFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostDataAtPointFilter);
public:
FemPostDataAtPointFilter(void);
FemPostDataAtPointFilter();
virtual ~FemPostDataAtPointFilter();
App::PropertyVectorDistance Center;
@@ -145,13 +145,13 @@ public:
App::PropertyFloatList PointData;
App::PropertyString Unit;
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemPostDataAtPoint";
}
virtual short int mustExecute(void) const;
virtual short int mustExecute() const;
protected:
virtual App::DocumentObjectExecReturn* execute(void);
virtual App::DocumentObjectExecReturn* execute();
virtual void onChanged(const App::Property* prop);
void GetPointData();
@@ -167,20 +167,20 @@ class FemExport FemPostScalarClipFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostScalarClipFilter);
public:
FemPostScalarClipFilter(void);
FemPostScalarClipFilter();
virtual ~FemPostScalarClipFilter();
App::PropertyBool InsideOut;
App::PropertyFloatConstraint Value;
App::PropertyEnumeration Scalars;
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemPostScalarClip";
}
virtual short int mustExecute(void) const;
virtual short int mustExecute() const;
protected:
virtual App::DocumentObjectExecReturn* execute(void);
virtual App::DocumentObjectExecReturn* execute();
virtual void onChanged(const App::Property* prop);
void setConstraintForField();
@@ -195,19 +195,19 @@ class FemExport FemPostWarpVectorFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostWarpVectorFilter);
public:
FemPostWarpVectorFilter(void);
FemPostWarpVectorFilter();
virtual ~FemPostWarpVectorFilter();
App::PropertyFloat Factor;
App::PropertyEnumeration Vector;
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemPostWarpVector";
}
virtual short int mustExecute(void) const;
virtual short int mustExecute() const;
protected:
virtual App::DocumentObjectExecReturn* execute(void);
virtual App::DocumentObjectExecReturn* execute();
virtual void onChanged(const App::Property* prop);
private:
@@ -220,16 +220,16 @@ class FemExport FemPostCutFilter : public FemPostFilter {
PROPERTY_HEADER(Fem::FemPostCutFilter);
public:
FemPostCutFilter(void);
FemPostCutFilter();
virtual ~FemPostCutFilter();
App::PropertyLink Function;
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemPostCut";
}
virtual short int mustExecute(void) const;
virtual App::DocumentObjectExecReturn* execute(void);
virtual short int mustExecute() const;
virtual App::DocumentObjectExecReturn* execute();
protected:
virtual void onChanged(const App::Property* prop);

8
src/Mod/Fem/App/FemPostFunction.cpp
View File

@@ -34,7 +34,7 @@ using namespace App;
PROPERTY_SOURCE(Fem::FemPostFunctionProvider, App::DocumentObject)
FemPostFunctionProvider::FemPostFunctionProvider(void) : DocumentObject() {
FemPostFunctionProvider::FemPostFunctionProvider() : DocumentObject() {
ADD_PROPERTY(Functions, (nullptr));
}
@@ -58,7 +58,7 @@ FemPostFunction::~FemPostFunction()
{
}
DocumentObjectExecReturn* FemPostFunction::execute(void) {
DocumentObjectExecReturn* FemPostFunction::execute() {
return DocumentObject::StdReturn;
}
@@ -68,7 +68,7 @@ DocumentObjectExecReturn* FemPostFunction::execute(void) {
// plane function
PROPERTY_SOURCE(Fem::FemPostPlaneFunction, Fem::FemPostFunction)
FemPostPlaneFunction::FemPostPlaneFunction(void) : FemPostFunction() {
FemPostPlaneFunction::FemPostPlaneFunction() : FemPostFunction() {
ADD_PROPERTY(Origin, (Base::Vector3d(0.0, 0.0, 0.0)));
ADD_PROPERTY(Normal, (Base::Vector3d(0.0, 0.0, 1.0)));
@@ -108,7 +108,7 @@ void FemPostPlaneFunction::onDocumentRestored() {
// sphere function
PROPERTY_SOURCE(Fem::FemPostSphereFunction, Fem::FemPostFunction)
FemPostSphereFunction::FemPostSphereFunction(void) : FemPostFunction() {
FemPostSphereFunction::FemPostSphereFunction() : FemPostFunction() {
ADD_PROPERTY(Radius, (5));
ADD_PROPERTY(Center, (Base::Vector3d(1.0, 0.0, 0.0)));

18
src/Mod/Fem/App/FemPostFunction.h
View File

@@ -43,14 +43,14 @@ class FemExport FemPostFunction : public App::DocumentObject
public:
/// Constructor
FemPostFunction(void);
FemPostFunction();
virtual ~FemPostFunction();
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemPostFunction";
}
virtual App::DocumentObjectExecReturn* execute(void);
virtual App::DocumentObjectExecReturn* execute();
//bound box handling
void setBoundingBox(vtkBoundingBox b) {m_boundingBox = b;};
@@ -68,10 +68,10 @@ class FemExport FemPostFunctionProvider : public App::DocumentObject {
PROPERTY_HEADER(Fem::FemPostFunctionProvider);
public:
FemPostFunctionProvider(void);
FemPostFunctionProvider();
virtual ~FemPostFunctionProvider();
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemPostFunctionProvider";
}
@@ -90,13 +90,13 @@ class FemExport FemPostPlaneFunction : public FemPostFunction
public:
FemPostPlaneFunction(void);
FemPostPlaneFunction();
virtual ~FemPostPlaneFunction();
App::PropertyVector Normal;
App::PropertyVectorDistance Origin;
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemPostPlaneFunction";
}
@@ -116,13 +116,13 @@ class FemExport FemPostSphereFunction : public FemPostFunction
public:
FemPostSphereFunction(void);
FemPostSphereFunction();
virtual ~FemPostSphereFunction();
App::PropertyDistance Radius;
App::PropertyVectorDistance Center;
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemPostSphereFunction";
}

2
src/Mod/Fem/App/FemPostObject.h
View File

@@ -39,7 +39,7 @@ class FemExport FemPostObject : public App::GeoFeature
public:
/// Constructor
FemPostObject(void);
FemPostObject();
virtual ~FemPostObject();
Fem::PropertyPostDataObject Data;

6
src/Mod/Fem/App/FemPostPipeline.cpp
View File

@@ -70,7 +70,7 @@ FemPostPipeline::~FemPostPipeline()
{
}
short FemPostPipeline::mustExecute(void) const
short FemPostPipeline::mustExecute() const
{
if (Mode.isTouched())
return 1;
@@ -78,7 +78,7 @@ short FemPostPipeline::mustExecute(void) const
return FemPostFilter::mustExecute();
}
DocumentObjectExecReturn* FemPostPipeline::execute(void) {
DocumentObjectExecReturn* FemPostPipeline::execute() {
//if we are the toplevel pipeline our data object is not created by filters, we are the main source
if (!Input.getValue())
@@ -274,7 +274,7 @@ void FemPostPipeline::load(FemResultObject* res) {
Data.setValue(grid);
}
PyObject* FemPostPipeline::getPyObject(void)
PyObject* FemPostPipeline::getPyObject()
{
if (PythonObject.is(Py::_None())) {
// ref counter is set to 1

8
src/Mod/Fem/App/FemPostPipeline.h
View File

@@ -40,18 +40,18 @@ class FemExport FemPostPipeline : public Fem::FemPostFilter
public:
/// Constructor
FemPostPipeline(void);
FemPostPipeline();
virtual ~FemPostPipeline();
App::PropertyLinkList Filter;
App::PropertyLink Functions;
App::PropertyEnumeration Mode;
short mustExecute(void) const;
virtual App::DocumentObjectExecReturn* execute(void);
short mustExecute() const;
virtual App::DocumentObjectExecReturn* execute();
PyObject* getPyObject();
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderFemPostPipeline";
}

2
src/Mod/Fem/App/FemPostPipelinePyImp.cpp
View File

@@ -35,7 +35,7 @@
using namespace Fem;
// returns a string which represents the object e.g. when printed in python
std::string FemPostPipelinePy::representation(void) const
std::string FemPostPipelinePy::representation() const
{
return std::string("<FemPostPipeline object>");
}

6
src/Mod/Fem/App/FemResultObject.cpp
View File

@@ -51,7 +51,7 @@ FemResultObject::~FemResultObject()
{
}
short FemResultObject::mustExecute(void) const
short FemResultObject::mustExecute() const
{
return 0;
}
@@ -70,12 +70,12 @@ PyObject *FemResultObject::getPyObject()
namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(Fem::FemResultObjectPython, Fem::FemResultObject)
template<> const char* Fem::FemResultObjectPython::getViewProviderName(void) const {
template<> const char* Fem::FemResultObjectPython::getViewProviderName() const {
return "FemGui::ViewProviderResultPython";
}
/// @endcond
template<> PyObject* Fem::FemResultObjectPython::getPyObject(void) {
template<> PyObject* Fem::FemResultObjectPython::getPyObject() {
if (PythonObject.is(Py::_None())) {
// ref counter is set to 1
PythonObject = Py::Object(new App::FeaturePythonPyT<App::DocumentObjectPy>(this),true);

10
src/Mod/Fem/App/FemResultObject.h
View File

@@ -38,7 +38,7 @@ class FemExport FemResultObject : public App::DocumentObject
public:
/// Constructor
FemResultObject(void);
FemResultObject();
virtual ~FemResultObject();
App::PropertyIntegerList NodeNumbers;
@@ -51,14 +51,14 @@ public:
/// Displacement vectors of analysis
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderResult";
}
virtual App::DocumentObjectExecReturn *execute(void) {
virtual App::DocumentObjectExecReturn *execute() {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute(void) const;
virtual PyObject *getPyObject(void);
virtual short mustExecute() const;
virtual PyObject *getPyObject();
};
typedef App::FeaturePythonT<FemResultObject> FemResultObjectPython;

2
src/Mod/Fem/App/FemSetElementsObject.cpp
View File

@@ -43,7 +43,7 @@ FemSetElementsObject::~FemSetElementsObject()
{
}
short FemSetElementsObject::mustExecute(void) const
short FemSetElementsObject::mustExecute() const
{
return 0;
}

10
src/Mod/Fem/App/FemSetElementsObject.h
View File

@@ -36,18 +36,18 @@ class FemExport FemSetElementsObject : public FemSetObject
public:
/// Constructor
FemSetElementsObject(void);
FemSetElementsObject();
virtual ~FemSetElementsObject();
// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderSetElements";
}
virtual App::DocumentObjectExecReturn *execute(void) {
virtual App::DocumentObjectExecReturn *execute() {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute(void) const;
virtual PyObject *getPyObject(void);
virtual short mustExecute() const;
virtual PyObject *getPyObject();
};

2
src/Mod/Fem/App/FemSetFacesObject.cpp
View File

@@ -44,7 +44,7 @@ FemSetFacesObject::~FemSetFacesObject()
{
}
short FemSetFacesObject::mustExecute(void) const
short FemSetFacesObject::mustExecute() const
{
return 0;
}

10
src/Mod/Fem/App/FemSetFacesObject.h
View File

@@ -36,18 +36,18 @@ class FemExport FemSetFacesObject : public FemSetObject
public:
/// Constructor
FemSetFacesObject(void);
FemSetFacesObject();
virtual ~FemSetFacesObject();
// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderSetFaces";
}
virtual App::DocumentObjectExecReturn *execute(void) {
virtual App::DocumentObjectExecReturn *execute() {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute(void) const;
virtual PyObject *getPyObject(void);
virtual short mustExecute() const;
virtual PyObject *getPyObject();
};
} //namespace Fem

2
src/Mod/Fem/App/FemSetGeometryObject.cpp
View File

@@ -44,7 +44,7 @@ FemSetGeometryObject::~FemSetGeometryObject()
{
}
short FemSetGeometryObject::mustExecute(void) const
short FemSetGeometryObject::mustExecute() const
{
return 0;
}

10
src/Mod/Fem/App/FemSetGeometryObject.h
View File

@@ -36,18 +36,18 @@ class FemExport FemSetGeometryObject : public FemSetObject
public:
/// Constructor
FemSetGeometryObject(void);
FemSetGeometryObject();
virtual ~FemSetGeometryObject();
// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderSetGeometry";
}
virtual App::DocumentObjectExecReturn *execute(void) {
virtual App::DocumentObjectExecReturn *execute() {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute(void) const;
virtual PyObject *getPyObject(void);
virtual short mustExecute() const;
virtual PyObject *getPyObject();
};

2
src/Mod/Fem/App/FemSetNodesObject.cpp
View File

@@ -45,7 +45,7 @@ FemSetNodesObject::~FemSetNodesObject()
{
}
short FemSetNodesObject::mustExecute(void) const
short FemSetNodesObject::mustExecute() const
{
return 0;
}

10
src/Mod/Fem/App/FemSetNodesObject.h
View File

@@ -37,20 +37,20 @@ class FemExport FemSetNodesObject : public FemSetObject
public:
/// Constructor
FemSetNodesObject(void);
FemSetNodesObject();
virtual ~FemSetNodesObject();
App::PropertyIntegerSet Nodes;
// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderSetNodes";
}
virtual App::DocumentObjectExecReturn *execute(void) {
virtual App::DocumentObjectExecReturn *execute() {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute(void) const;
virtual PyObject *getPyObject(void);
virtual short mustExecute() const;
virtual PyObject *getPyObject();
};

2
src/Mod/Fem/App/FemSetObject.cpp
View File

@@ -45,7 +45,7 @@ FemSetObject::~FemSetObject()
{
}
short FemSetObject::mustExecute(void) const
short FemSetObject::mustExecute() const
{
return 0;
}

8
src/Mod/Fem/App/FemSetObject.h
View File

@@ -37,7 +37,7 @@ class FemExport FemSetObject : public App::DocumentObject
public:
/// Constructor
FemSetObject(void);
FemSetObject();
virtual ~FemSetObject();
App::PropertyLink FemMesh;
@@ -46,11 +46,11 @@ public:
//virtual const char* getViewProviderName(void) const {
// return "FemGui::ViewProviderFemSet";
//}
virtual App::DocumentObjectExecReturn *execute(void) {
virtual App::DocumentObjectExecReturn *execute() {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute(void) const;
virtual PyObject *getPyObject(void);
virtual short mustExecute() const;
virtual PyObject *getPyObject();
};

6
src/Mod/Fem/App/FemSolverObject.cpp
View File

@@ -47,7 +47,7 @@ FemSolverObject::~FemSolverObject()
{
}
short FemSolverObject::mustExecute(void) const
short FemSolverObject::mustExecute() const
{
return 0;
}
@@ -66,11 +66,11 @@ PyObject *FemSolverObject::getPyObject()
namespace App {
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(Fem::FemSolverObjectPython, Fem::FemSolverObject)
template<> const char* Fem::FemSolverObjectPython::getViewProviderName(void) const {
template<> const char* Fem::FemSolverObjectPython::getViewProviderName() const {
return "FemGui::ViewProviderSolverPython";
}
template<> PyObject* Fem::FemSolverObjectPython::getPyObject(void) {
template<> PyObject* Fem::FemSolverObjectPython::getPyObject() {
if (PythonObject.is(Py::_None())) {
// ref counter is set to 1
PythonObject = Py::Object(new App::FeaturePythonPyT<App::DocumentObjectPy>(this),true);

10
src/Mod/Fem/App/FemSolverObject.h
View File

@@ -37,20 +37,20 @@ class FemExport FemSolverObject : public App::DocumentObject
public:
/// Constructor
FemSolverObject(void);
FemSolverObject();
virtual ~FemSolverObject();
// Attributes are implemented in the FemSolverObjectPython
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
virtual const char* getViewProviderName() const {
return "FemGui::ViewProviderSolver";
}
virtual App::DocumentObjectExecReturn *execute(void) {
virtual App::DocumentObjectExecReturn *execute() {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute(void) const;
virtual PyObject *getPyObject(void);
virtual short mustExecute() const;
virtual PyObject *getPyObject();
};

8
src/Mod/Fem/App/PropertyPostDataObject.cpp
View File

@@ -127,7 +127,7 @@ void PropertyPostDataObject::setValue(const vtkSmartPointer<vtkDataObject> &ds)
hasSetValue();
}
const vtkSmartPointer<vtkDataObject> &PropertyPostDataObject::getValue(void) const
const vtkSmartPointer<vtkDataObject> &PropertyPostDataObject::getValue() const
{
return m_dataObject;
}
@@ -154,7 +154,7 @@ int PropertyPostDataObject::getDataType()
}
PyObject *PropertyPostDataObject::getPyObject(void)
PyObject *PropertyPostDataObject::getPyObject()
{
//TODO: fetch the vtk python object from the data set and return it
return Py::new_reference_to(Py::None());
@@ -164,7 +164,7 @@ void PropertyPostDataObject::setPyObject(PyObject * /*value*/)
{
}
App::Property *PropertyPostDataObject::Copy(void) const
App::Property *PropertyPostDataObject::Copy() const
{
PropertyPostDataObject *prop = new PropertyPostDataObject();
if (m_dataObject) {
@@ -218,7 +218,7 @@ void PropertyPostDataObject::Paste(const App::Property &from)
hasSetValue();
}
unsigned int PropertyPostDataObject::getMemSize(void) const
unsigned int PropertyPostDataObject::getMemSize() const
{
return m_dataObject ? m_dataObject->GetActualMemorySize() : 0;
}

8
src/Mod/Fem/App/PropertyPostDataObject.h
View File

@@ -52,7 +52,7 @@ public:
/// set the dataset
void setValue(const vtkSmartPointer<vtkDataObject>&);
/// get the part shape
const vtkSmartPointer<vtkDataObject>& getValue(void) const;
const vtkSmartPointer<vtkDataObject>& getValue() const;
/// check if we hold a dataset or a dataobject (which would mean a composite data structure)
bool isDataSet();
bool isComposite();
@@ -61,7 +61,7 @@ public:
/** @name Python interface */
//@{
PyObject* getPyObject(void);
PyObject* getPyObject();
void setPyObject(PyObject *value);
//@}
@@ -73,9 +73,9 @@ public:
void SaveDocFile (Base::Writer &writer) const;
void RestoreDocFile(Base::Reader &reader);
App::Property *Copy(void) const;
App::Property *Copy() const;
void Paste(const App::Property &from);
unsigned int getMemSize (void) const;
unsigned int getMemSize () const;
//@}
/// Get valid paths for this property; used by auto completer

2
src/Mod/Fem/Gui/AppFemGui.cpp
View File

@@ -76,7 +76,7 @@
// use a different name to CreateCommand()
void CreateFemCommands(void);
void CreateFemCommands();
void loadFemResource()
{

60
src/Mod/Fem/Gui/Command.cpp
View File

@@ -314,7 +314,7 @@ void CmdFemConstraintBearing::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintBearing::isActive(void)
bool CmdFemConstraintBearing::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -359,7 +359,7 @@ void CmdFemConstraintContact::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintContact::isActive(void)
bool CmdFemConstraintContact::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -402,7 +402,7 @@ void CmdFemConstraintDisplacement::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintDisplacement::isActive(void)
bool CmdFemConstraintDisplacement::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -444,7 +444,7 @@ void CmdFemConstraintFixed::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintFixed::isActive(void)
bool CmdFemConstraintFixed::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -487,7 +487,7 @@ void CmdFemConstraintFluidBoundary::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintFluidBoundary::isActive(void)
bool CmdFemConstraintFluidBoundary::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -531,7 +531,7 @@ void CmdFemConstraintForce::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintForce::isActive(void)
bool CmdFemConstraintForce::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -572,7 +572,7 @@ void CmdFemConstraintGear::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintGear::isActive(void)
bool CmdFemConstraintGear::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -617,7 +617,7 @@ void CmdFemConstraintHeatflux::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintHeatflux::isActive(void)
bool CmdFemConstraintHeatflux::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -660,7 +660,7 @@ void CmdFemConstraintInitialTemperature::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintInitialTemperature::isActive(void)
bool CmdFemConstraintInitialTemperature::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -702,7 +702,7 @@ void CmdFemConstraintPlaneRotation::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintPlaneRotation::isActive(void)
bool CmdFemConstraintPlaneRotation::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -747,7 +747,7 @@ void CmdFemConstraintPressure::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintPressure::isActive(void)
bool CmdFemConstraintPressure::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -792,7 +792,7 @@ void CmdFemConstraintSpring::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintSpring::isActive(void)
bool CmdFemConstraintSpring::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -838,7 +838,7 @@ void CmdFemConstraintPulley::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintPulley::isActive(void)
bool CmdFemConstraintPulley::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -881,7 +881,7 @@ void CmdFemConstraintTemperature::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintTemperature::isActive(void)
bool CmdFemConstraintTemperature::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -927,7 +927,7 @@ void CmdFemConstraintTransform::activated(int)
doCommand(Gui, "Gui.activeDocument().setEdit('%s')", FeatName.c_str());
}
bool CmdFemConstraintTransform::isActive(void)
bool CmdFemConstraintTransform::isActive()
{
return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject();
}
@@ -1063,7 +1063,7 @@ void CmdFemDefineNodesSet::activated(int)
}
}
bool CmdFemDefineNodesSet::isActive(void)
bool CmdFemDefineNodesSet::isActive()
{
// Check for the selected mesh feature (all Mesh types)
if (getSelection().countObjectsOfType(Fem::FemMeshObject::getClassTypeId()) != 1)
@@ -1121,7 +1121,7 @@ void CmdFemCreateNodesSet::activated(int)
}
}
bool CmdFemCreateNodesSet::isActive(void)
bool CmdFemCreateNodesSet::isActive()
{
return hasActiveDocument();
}
@@ -1311,7 +1311,7 @@ void CmdFemPostClipFilter::activated(int)
setupFilter(this, "Clip");
}
bool CmdFemPostClipFilter::isActive(void)
bool CmdFemPostClipFilter::isActive()
{
// only allow one object
if (getSelection().getSelection().size() > 1)
@@ -1354,7 +1354,7 @@ void CmdFemPostCutFilter::activated(int)
setupFilter(this, "Cut");
}
bool CmdFemPostCutFilter::isActive(void)
bool CmdFemPostCutFilter::isActive()
{
// only allow one object
if (getSelection().getSelection().size() > 1)
@@ -1397,7 +1397,7 @@ void CmdFemPostDataAlongLineFilter::activated(int)
setupFilter(this, "DataAlongLine");
}
bool CmdFemPostDataAlongLineFilter::isActive(void)
bool CmdFemPostDataAlongLineFilter::isActive()
{
// only allow one object
if (getSelection().getSelection().size() > 1)
@@ -1440,7 +1440,7 @@ void CmdFemPostDataAtPointFilter::activated(int)
}
bool CmdFemPostDataAtPointFilter::isActive(void)
bool CmdFemPostDataAtPointFilter::isActive()
{
// only allow one object
if (getSelection().getSelection().size() > 1)
@@ -1515,7 +1515,7 @@ void CmdFemPostLinearizedStressesFilter::activated(int)
}
}
bool CmdFemPostLinearizedStressesFilter::isActive(void)
bool CmdFemPostLinearizedStressesFilter::isActive()
{
// only allow one object
if (getSelection().getSelection().size() > 1)
@@ -1547,7 +1547,7 @@ void CmdFemPostScalarClipFilter::activated(int)
setupFilter(this, "ScalarClip");
}
bool CmdFemPostScalarClipFilter::isActive(void)
bool CmdFemPostScalarClipFilter::isActive()
{
// only allow one object
if (getSelection().getSelection().size() > 1)
@@ -1588,7 +1588,7 @@ void CmdFemPostWarpVectorFilter::activated(int)
setupFilter(this, "WarpVector");
}
bool CmdFemPostWarpVectorFilter::isActive(void)
bool CmdFemPostWarpVectorFilter::isActive()
{
// only allow one object
if (getSelection().getSelection().size() > 1)
@@ -1697,7 +1697,7 @@ void CmdFemPostFunctions::activated(int iMsg)
pcAction->setIcon(a[iMsg]->icon());
}
Gui::Action* CmdFemPostFunctions::createAction(void)
Gui::Action* CmdFemPostFunctions::createAction()
{
Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow());
pcAction->setDropDownMenu(true);
@@ -1740,7 +1740,7 @@ void CmdFemPostFunctions::languageChange()
}
bool CmdFemPostFunctions::isActive(void)
bool CmdFemPostFunctions::isActive()
{
if (getActiveGuiDocument())
return true;
@@ -1770,7 +1770,7 @@ void CmdFemPostApllyChanges::activated(int iMsg)
FemGui::FemSettings().setPostAutoRecompute(iMsg == 1);
}
bool CmdFemPostApllyChanges::isActive(void)
bool CmdFemPostApllyChanges::isActive()
{
if (getActiveGuiDocument())
return true;
@@ -1778,7 +1778,7 @@ bool CmdFemPostApllyChanges::isActive(void)
return false;
}
Gui::Action* CmdFemPostApllyChanges::createAction(void)
Gui::Action* CmdFemPostApllyChanges::createAction()
{
Gui::Action* pcAction = Command::createAction();
pcAction->setCheckable(true);
@@ -1869,7 +1869,7 @@ void CmdFemPostPipelineFromResult::activated(int)
}
}
bool CmdFemPostPipelineFromResult::isActive(void)
bool CmdFemPostPipelineFromResult::isActive()
{
// only activate if a result object is selected from which the pipeline can be loaded
std::vector<Fem::FemResultObject*> results = getSelection().getObjectsOfType<Fem::FemResultObject>();
@@ -1881,7 +1881,7 @@ bool CmdFemPostPipelineFromResult::isActive(void)
//================================================================================================
//================================================================================================
void CreateFemCommands(void)
void CreateFemCommands()
{
Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager();

4
src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
View File

@@ -92,7 +92,7 @@ TaskCreateNodeSet::TaskCreateNodeSet(Fem::FemSetNodesObject* pcObject, QWidget*
}
void TaskCreateNodeSet::Poly(void)
void TaskCreateNodeSet::Poly()
{
Gui::Document* doc = Gui::Application::Instance->activeDocument();
Gui::MDIView* view = doc->getActiveView();
@@ -104,7 +104,7 @@ void TaskCreateNodeSet::Poly(void)
}
}
void TaskCreateNodeSet::Pick(void)
void TaskCreateNodeSet::Pick()
{
if (selectionMode == none) {
selectionMode = PickElement;

4
src/Mod/Fem/Gui/TaskCreateNodeSet.h
View File

@@ -59,8 +59,8 @@ public:
ViewProviderFemMesh * MeshViewProvider;
private Q_SLOTS:
void Poly(void);
void Pick(void);
void Poly();
void Pick();
void SwitchMethod(int Value);
protected:

2
src/Mod/Fem/Gui/TaskDlgAnalysis.h
View File

@@ -55,7 +55,7 @@ public:
virtual void helpRequested();
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Apply; }
protected:

2
src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h
View File

@@ -57,7 +57,7 @@ public:
virtual void helpRequested();
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; }
protected:

2
src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h
View File

@@ -58,7 +58,7 @@ public:
virtual void helpRequested();
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Apply; }
protected:

6
src/Mod/Fem/Gui/TaskFemConstraint.h
View File

@@ -47,7 +47,7 @@ public:
TaskFemConstraint(ViewProviderFemConstraint *ConstraintView,QWidget *parent = nullptr,const char* pixmapname = "");
virtual ~TaskFemConstraint() {}
virtual const std::string getReferences(void) const {return std::string();}
virtual const std::string getReferences() const {return std::string();}
const std::string getReferences(const std::vector<std::string>& items) const;
const std::string getScale() const;
@@ -98,11 +98,11 @@ public:
virtual bool accept();
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
virtual bool isAllowedAlterDocument(void) const
virtual bool isAllowedAlterDocument() const
{ return false; }
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; }
ViewProviderFemConstraint* getConstraintView() const

6
src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp
View File

@@ -235,7 +235,7 @@ void TaskFemConstraintBearing::onCheckAxial(const bool pressed)
pcConstraint->AxialFree.setValue(pressed);
}
double TaskFemConstraintBearing::getDistance(void) const
double TaskFemConstraintBearing::getDistance() const
{
return ui->spinDistance->value();
}
@@ -250,7 +250,7 @@ const std::string TaskFemConstraintBearing::getReferences() const
return TaskFemConstraint::getReferences(items);
}
const std::string TaskFemConstraintBearing::getLocationName(void) const
const std::string TaskFemConstraintBearing::getLocationName() const
{
std::string loc = ui->lineLocation->text().toStdString();
if (loc.empty())
@@ -260,7 +260,7 @@ const std::string TaskFemConstraintBearing::getLocationName(void) const
return loc.substr(0, pos).c_str();
}
const std::string TaskFemConstraintBearing::getLocationObject(void) const
const std::string TaskFemConstraintBearing::getLocationObject() const
{
std::string loc = ui->lineLocation->text().toStdString();
if (loc.empty())

10
src/Mod/Fem/Gui/TaskFemConstraintBearing.h
View File

@@ -51,14 +51,14 @@ public:
const char* pixmapname = "FEM_ConstraintBearing");
virtual ~TaskFemConstraintBearing();
double getDistance(void) const;
double getDistance() const;
virtual const std::string getReferences() const;
const std::string getLocationName(void) const;
const std::string getLocationObject(void) const;
bool getAxial(void) const;
const std::string getLocationName() const;
const std::string getLocationObject() const;
bool getAxial() const;
private Q_SLOTS:
void onReferenceDeleted(void);
void onReferenceDeleted();
void onDistanceChanged(double l);
void onButtonLocation(const bool pressed = true);
void onCheckAxial(bool);

4
src/Mod/Fem/Gui/TaskFemConstraintContact.h
View File

@@ -47,8 +47,8 @@ public:
double get_Friction()const;
private Q_SLOTS:
void onReferenceDeletedSlave(void);
void onReferenceDeletedMaster(void);
void onReferenceDeletedSlave();
void onReferenceDeletedMaster();
void addToSelectionSlave();
void removeFromSelectionSlave();
void addToSelectionMaster();

2
src/Mod/Fem/Gui/TaskFemConstraintDisplacement.h
View File

@@ -72,7 +72,7 @@ public:
bool get_rotzfree()const;
private Q_SLOTS:
void onReferenceDeleted(void);
void onReferenceDeleted();
void x_changed(double);
void y_changed(double);
void z_changed(double);

2
src/Mod/Fem/Gui/TaskFemConstraintFixed.h
View File

@@ -43,7 +43,7 @@ public:
const std::string getReferences() const;
private Q_SLOTS:
void onReferenceDeleted(void);
void onReferenceDeleted();
void addToSelection();
void removeFromSelection();

42
src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h
View File

@@ -52,35 +52,35 @@ public:
TaskFemConstraintFluidBoundary(ViewProviderFemConstraintFluidBoundary *ConstraintView,QWidget *parent = nullptr);
virtual ~TaskFemConstraintFluidBoundary();
const Fem::FemSolverObject* getFemSolver(void) const;
const Fem::FemSolverObject* getFemSolver() const;
std::string getBoundaryType(void) const;
std::string getSubtype(void) const;
double getBoundaryValue(void) const;
std::string getBoundaryType() const;
std::string getSubtype() const;
double getBoundaryValue() const;
std::string getTurbulenceModel(void) const;
std::string getTurbulenceSpecification(void) const;
double getTurbulentIntensityValue(void) const;
double getTurbulentLengthValue(void) const;
std::string getTurbulenceModel() const;
std::string getTurbulenceSpecification() const;
double getTurbulentIntensityValue() const;
double getTurbulentLengthValue() const;
bool getHeatTransferring(void) const;
std::string getThermalBoundaryType(void) const;
double getTemperatureValue(void) const;
double getHeatFluxValue(void) const;
double getHTCoeffValue(void) const;
bool getHeatTransferring() const;
std::string getThermalBoundaryType() const;
double getTemperatureValue() const;
double getHeatFluxValue() const;
double getHTCoeffValue() const;
const std::string getReferences() const;
const std::string getDirectionName(void) const;
const std::string getDirectionObject(void) const;
bool getReverse(void) const;
const std::string getDirectionName() const;
const std::string getDirectionObject() const;
bool getReverse() const;
private Q_SLOTS:
void onBoundaryTypeChanged(void);
void onSubtypeChanged(void);
void onBoundaryTypeChanged();
void onSubtypeChanged();
void onBoundaryValueChanged(double);
void onTurbulenceSpecificationChanged(void);
void onThermalBoundaryTypeChanged(void);
void onReferenceDeleted(void);
void onTurbulenceSpecificationChanged();
void onThermalBoundaryTypeChanged();
void onReferenceDeleted();
void onButtonDirection(const bool pressed = true);
void onCheckReverse(bool); // consider removing this slot as the UI is hidden
void addToSelection();

6
src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
View File

@@ -322,7 +322,7 @@ void TaskFemConstraintForce::onCheckReverse(const bool pressed)
pcConstraint->Reversed.setValue(pressed);
}
double TaskFemConstraintForce::getForce(void) const
double TaskFemConstraintForce::getForce() const
{
return ui->spinForce->value().getValue();
}
@@ -337,7 +337,7 @@ const std::string TaskFemConstraintForce::getReferences() const
return TaskFemConstraint::getReferences(items);
}
const std::string TaskFemConstraintForce::getDirectionName(void) const
const std::string TaskFemConstraintForce::getDirectionName() const
{
std::string dir = ui->lineDirection->text().toStdString();
if (dir.empty())
@@ -347,7 +347,7 @@ const std::string TaskFemConstraintForce::getDirectionName(void) const
return dir.substr(0, pos).c_str();
}
const std::string TaskFemConstraintForce::getDirectionObject(void) const
const std::string TaskFemConstraintForce::getDirectionObject() const
{
std::string dir = ui->lineDirection->text().toStdString();
if (dir.empty())

10
src/Mod/Fem/Gui/TaskFemConstraintForce.h
View File

@@ -50,14 +50,14 @@ class TaskFemConstraintForce : public TaskFemConstraintOnBoundary
public:
TaskFemConstraintForce(ViewProviderFemConstraintForce *ConstraintView,QWidget *parent = nullptr);
virtual ~TaskFemConstraintForce();
double getForce(void) const;
double getForce() const;
const std::string getReferences() const;
const std::string getDirectionName(void) const;
const std::string getDirectionObject(void) const;
bool getReverse(void) const;
const std::string getDirectionName() const;
const std::string getDirectionObject() const;
bool getReverse() const;
private Q_SLOTS:
void onReferenceDeleted(void);
void onReferenceDeleted();
void onForceChanged(double);
void onButtonDirection(const bool pressed = false);
void onCheckReverse(bool);

10
src/Mod/Fem/Gui/TaskFemConstraintGear.cpp
View File

@@ -206,17 +206,17 @@ void TaskFemConstraintGear::onCheckReversed(const bool pressed)
pcConstraint->Reversed.setValue(pressed);
}
double TaskFemConstraintGear::getForce(void) const
double TaskFemConstraintGear::getForce() const
{
return ui->spinForce->value();
}
double TaskFemConstraintGear::getForceAngle(void) const
double TaskFemConstraintGear::getForceAngle() const
{
return ui->spinForceAngle->value();
}
const std::string TaskFemConstraintGear::getDirectionName(void) const
const std::string TaskFemConstraintGear::getDirectionName() const
{
std::string dir = ui->lineDirection->text().toStdString();
if (dir.empty())
@@ -226,7 +226,7 @@ const std::string TaskFemConstraintGear::getDirectionName(void) const
return dir.substr(0, pos).c_str();
}
const std::string TaskFemConstraintGear::getDirectionObject(void) const
const std::string TaskFemConstraintGear::getDirectionObject() const
{
std::string dir = ui->lineDirection->text().toStdString();
if (dir.empty())
@@ -241,7 +241,7 @@ bool TaskFemConstraintGear::getReverse() const
return ui->checkReversed->isChecked();
}
double TaskFemConstraintGear::getDiameter(void) const
double TaskFemConstraintGear::getDiameter() const
{
return ui->spinDiameter->value();
}

12
src/Mod/Fem/Gui/TaskFemConstraintGear.h
View File

@@ -37,12 +37,12 @@ public:
TaskFemConstraintGear(ViewProviderFemConstraint *ConstraintView,QWidget *parent = nullptr,
const char* pixmapname = "FEM_ConstraintGear");
double getDiameter(void) const;
double getForce(void) const;
double getForceAngle(void) const;
const std::string getDirectionName(void) const;
const std::string getDirectionObject(void) const;
bool getReverse(void) const;
double getDiameter() const;
double getForce() const;
double getForceAngle() const;
const std::string getDirectionName() const;
const std::string getDirectionObject() const;
bool getReverse() const;
private Q_SLOTS:
void onDiameterChanged(double dia);

6
src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
View File

@@ -321,21 +321,21 @@ const std::string TaskFemConstraintHeatflux::getReferences() const
return TaskFemConstraint::getReferences(items);
}
double TaskFemConstraintHeatflux::getAmbientTemp(void) const
double TaskFemConstraintHeatflux::getAmbientTemp() const
{
Base::Quantity temperature = ui->if_ambienttemp->getQuantity();
double temperature_in_kelvin = temperature.getValueAs(Base::Quantity::Kelvin);
return temperature_in_kelvin;
}
double TaskFemConstraintHeatflux::getFilmCoef(void) const
double TaskFemConstraintHeatflux::getFilmCoef() const
{
Base::Quantity filmcoef = ui->if_filmcoef->getQuantity();
double filmcoef_in_units = filmcoef.getValueAs(Base::Quantity(1.0, Base::Unit::ThermalTransferCoefficient));
return filmcoef_in_units;
}
std::string TaskFemConstraintHeatflux::get_constraint_type(void) const {
std::string TaskFemConstraintHeatflux::get_constraint_type() const {
std::string type;
if (ui->rb_convection->isChecked()) {
type = "\"Convection\"";

8
src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h
View File

@@ -42,14 +42,14 @@ class TaskFemConstraintHeatflux : public TaskFemConstraintOnBoundary
public:
TaskFemConstraintHeatflux(ViewProviderFemConstraintHeatflux *ConstraintView,QWidget *parent = nullptr);
virtual ~TaskFemConstraintHeatflux();
double getAmbientTemp(void) const;
double getAmbientTemp() const;
/*double getFaceTemp(void) const;*/
double getFilmCoef(void) const;
std::string get_constraint_type(void) const;
double getFilmCoef() const;
std::string get_constraint_type() const;
virtual const std::string getReferences() const;
private Q_SLOTS:
void onReferenceDeleted(void);
void onReferenceDeleted();
void onAmbientTempChanged(double val);
/*void onFaceTempChanged(double val);*/
void onFilmCoefChanged(double val);

2
src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.h
View File

@@ -45,7 +45,7 @@ public:
const std::string getReferences() const;
private Q_SLOTS:
void onReferenceDeleted(void);
void onReferenceDeleted();
void addToSelection();
void removeFromSelection();

2
src/Mod/Fem/Gui/TaskFemConstraintPressure.h
View File

@@ -47,7 +47,7 @@ public:
bool get_Reverse()const;
private Q_SLOTS:
void onReferenceDeleted(void);
void onReferenceDeleted();
void onCheckReverse(bool);
void addToSelection();
void removeFromSelection();

8
src/Mod/Fem/Gui/TaskFemConstraintPulley.cpp
View File

@@ -123,12 +123,12 @@ void TaskFemConstraintPulley::onCheckIsDriven(const bool pressed)
pcConstraint->IsDriven.setValue(pressed);
}
double TaskFemConstraintPulley::getTorque(void) const
double TaskFemConstraintPulley::getTorque() const
{
return ui->spinForce->value();
}
double TaskFemConstraintPulley::getTensionForce(void) const
double TaskFemConstraintPulley::getTensionForce() const
{
return ui->spinTensionForce->value();
}
@@ -138,12 +138,12 @@ bool TaskFemConstraintPulley::getIsDriven() const
return ui->checkIsDriven->isChecked();
}
double TaskFemConstraintPulley::getOtherDiameter(void) const
double TaskFemConstraintPulley::getOtherDiameter() const
{
return ui->spinOtherDiameter->value();
}
double TaskFemConstraintPulley::getCenterDistance(void) const
double TaskFemConstraintPulley::getCenterDistance() const
{
return ui->spinCenterDistance->value();
}

10
src/Mod/Fem/Gui/TaskFemConstraintPulley.h
View File

@@ -36,11 +36,11 @@ class TaskFemConstraintPulley : public TaskFemConstraintGear
public:
TaskFemConstraintPulley(ViewProviderFemConstraintPulley *ConstraintView,QWidget *parent = nullptr);
double getOtherDiameter(void) const;
double getCenterDistance(void) const;
double getTensionForce(void) const;
double getTorque(void) const;
bool getIsDriven(void) const;
double getOtherDiameter() const;
double getCenterDistance() const;
double getTensionForce() const;
double getTorque() const;
bool getIsDriven() const;
private Q_SLOTS:
void onOtherDiameterChanged(double dia);

2
src/Mod/Fem/Gui/TaskFemConstraintSpring.h
View File

@@ -45,7 +45,7 @@ public:
double get_tangentialStiffness()const;
private Q_SLOTS:
void onReferenceDeleted(void);
void onReferenceDeleted();
void addToSelection();
void removeFromSelection();

2
src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
View File

@@ -278,7 +278,7 @@ double TaskFemConstraintTemperature::get_cflux() const {
return cflux_in_watt;
}
std::string TaskFemConstraintTemperature::get_constraint_type(void) const {
std::string TaskFemConstraintTemperature::get_constraint_type() const {
std::string type;
if (ui->rb_temperature->isChecked()) {
type = "\"Temperature\"";

4
src/Mod/Fem/Gui/TaskFemConstraintTemperature.h
View File

@@ -48,10 +48,10 @@ public:
const std::string getReferences() const;
double get_temperature()const;
double get_cflux() const;
std::string get_constraint_type(void) const;
std::string get_constraint_type() const;
private Q_SLOTS:
void onReferenceDeleted(void);
void onReferenceDeleted();
void onTempCfluxChanged(double val);
void Temp();
void Flux();

2
src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
View File

@@ -446,7 +446,7 @@ double TaskFemConstraintTransform::get_X_rot() const { return ui->sp_X->value();
double TaskFemConstraintTransform::get_Y_rot() const { return ui->sp_Y->value(); }
double TaskFemConstraintTransform::get_Z_rot() const { return ui->sp_Z->value(); }
std::string TaskFemConstraintTransform::get_transform_type(void) const {
std::string TaskFemConstraintTransform::get_transform_type() const {
std::string transform;
if (ui->rb_rect->isChecked()) {
transform = "\"Rectangular\"";

4
src/Mod/Fem/Gui/TaskFemConstraintTransform.h
View File

@@ -47,11 +47,11 @@ public:
double get_X_rot()const;
double get_Y_rot()const;
double get_Z_rot()const;
std::string get_transform_type(void) const;
std::string get_transform_type() const;
static std::string getSurfaceReferences(const std::string showConstr);
private Q_SLOTS:
void onReferenceDeleted(void);
void onReferenceDeleted();
void Rect();
void Cyl();
void addToSelection();

2
src/Mod/Fem/Gui/TaskPostBoxes.cpp
View File

@@ -225,7 +225,7 @@ TaskDlgPost::~TaskDlgPost()
}
QDialogButtonBox::StandardButtons TaskDlgPost::getStandardButtons(void) const {
QDialogButtonBox::StandardButtons TaskDlgPost::getStandardButtons() const {
//check if we only have gui task boxes
bool guionly = true;

4
src/Mod/Fem/Gui/TaskPostBoxes.h
View File

@@ -198,12 +198,12 @@ public:
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
/// is called by the framework if the user presses the help button
virtual bool isAllowedAlterDocument(void) const
virtual bool isAllowedAlterDocument() const
{ return false; }
virtual void modifyStandardButtons(QDialogButtonBox*);
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const;
virtual QDialogButtonBox::StandardButtons getStandardButtons() const;
protected:
void recompute();

2
src/Mod/Fem/Gui/TaskTetParameter.cpp
View File

@@ -147,7 +147,7 @@ void TaskTetParameter::setOptimize(int v)
}
void TaskTetParameter::setInfo(void)
void TaskTetParameter::setInfo()
{
Fem::FemMesh::FemMeshInfo info = pcObject->FemMesh.getValue().getInfo();
//Base::BoundBox3d bndBox = pcObject->FemMesh.getValue().getBoundBox();

2
src/Mod/Fem/Gui/TaskTetParameter.h
View File

@@ -58,7 +58,7 @@ public:
TaskTetParameter(Fem::FemMeshShapeNetgenObject *pcObject,QWidget *parent = nullptr);
~TaskTetParameter();
void setInfo(void);
void setInfo();
bool touched;
private Q_SLOTS:

Some files were not shown because too many files have changed in this diff Show More