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

[FEM] ViewProviderFemConstrain*: remove unused includes - part 2/2

Browse Source 
- also sort includes
- also fix warnings about too long lines
This commit is contained in:
Uwe
2022-10-03 18:14:51 +02:00
parent 8522b9c813
commit c63ce3f10b
7 changed files with 196 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.cpp
View File

@@ -21,26 +21,21 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Standard_math.hxx>
# include <Precision.hxx>
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/nodes/SoTranslation.h>
# include <Inventor/nodes/SoRotation.h>
# include <QMessageBox>
# include <Precision.hxx>
# include <Inventor/SbRotation.h>
# include <Inventor/SbVec3f.h>
# include <Inventor/nodes/SoSeparator.h>
#endif
#include "ViewProviderFemConstraintPulley.h"
#include <Mod/Fem/App/FemConstraintPulley.h>
#include "TaskFemConstraintPulley.h"
#include "Gui/Control.h"
#include <Mod/Fem/App/FemConstraintPulley.h>
#include "ViewProviderFemConstraintPulley.h"
#include "TaskFemConstraintPulley.h"
#include <Base/Console.h>
using namespace FemGui;
@@ -112,7 +107,7 @@ void ViewProviderFemConstraintPulley::updateData(const App::Property* prop)
// Gets called whenever a property of the attached object changes
Fem::ConstraintPulley* pcConstraint = static_cast<Fem::ConstraintPulley*>(this->getObject());
if (strcmp(prop->getName(),"BasePoint") == 0) {
if (strcmp(prop->getName(), "BasePoint") == 0) {
if (pcConstraint->Height.getValue() > Precision::Confusion()) {
// Remove and recreate the symbol
Gui::coinRemoveAllChildren(pShapeSep);
@@ -129,30 +124,40 @@ void ViewProviderFemConstraintPulley::updateData(const App::Property* prop)
double rat1 = 0.8, rat2 = 0.2;
double f1 = pcConstraint->BeltForce1.getValue();
double f2 = pcConstraint->BeltForce2.getValue();
if (f1+f2 > Precision::Confusion()) {
rat1 = f1 / (f1+f2);
rat2 = f2 / (f1+f2);
if (f1 + f2 > Precision::Confusion()) {
rat1 = f1 / (f1 + f2);
rat2 = f2 / (f1 + f2);
}
SbVec3f b(base.x, base.y, base.z);
SbVec3f ax(axis.x, axis.y, axis.z);
createPlacement(pShapeSep, b, SbRotation(SbVec3f(0,1,0), ax)); // child 0 and 1
pShapeSep->addChild(createCylinder(pcConstraint->Height.getValue() * 0.8, dia/2)); // child 2
SoSeparator* sep = new SoSeparator();
createPlacement(sep, SbVec3f(dia/2 * sin(forceAngle+beltAngle), 0, dia/2 * cos(forceAngle+beltAngle)),
SbRotation(SbVec3f(0,1,0), SbVec3f(sin(forceAngle+beltAngle+M_PI_2),0,cos(forceAngle+beltAngle+M_PI_2))));
createPlacement(sep, SbVec3f(0, dia/8 + dia/2 * rat1, 0), SbRotation());
sep->addChild(createArrow(dia/8 + dia/2 * rat1, dia/8));
pShapeSep->addChild(sep); // child 3
createPlacement(pShapeSep, b, SbRotation(SbVec3f(0, 1, 0), ax));// child 0 and 1
pShapeSep->addChild(
createCylinder(pcConstraint->Height.getValue() * 0.8, dia / 2));// child 2
SoSeparator *sep = new SoSeparator();
createPlacement(sep,
SbVec3f(dia / 2 * sin(forceAngle + beltAngle), 0,
dia / 2 * cos(forceAngle + beltAngle)),
SbRotation(SbVec3f(0, 1, 0),
SbVec3f(sin(forceAngle + beltAngle + M_PI_2), 0,
cos(forceAngle + beltAngle + M_PI_2))));
createPlacement(sep, SbVec3f(0, dia / 8 + dia / 2 * rat1, 0), SbRotation());
sep->addChild(createArrow(dia / 8 + dia / 2 * rat1, dia / 8));
pShapeSep->addChild(sep);// child 3
sep = new SoSeparator();
createPlacement(sep, SbVec3f(-dia/2 * sin(forceAngle-beltAngle), 0, -dia/2 * cos(forceAngle-beltAngle)),
SbRotation(SbVec3f(0,1,0), SbVec3f(-sin(forceAngle-beltAngle-M_PI_2),0,-cos(forceAngle-beltAngle-M_PI_2))));
createPlacement(sep, SbVec3f(0, dia/8 + dia/2 * rat2, 0), SbRotation());
sep->addChild(createArrow(dia/8 + dia/2 * rat2, dia/8));
pShapeSep->addChild(sep); // child 4
createPlacement(sep,
SbVec3f(-dia / 2 * sin(forceAngle - beltAngle), 0,
-dia / 2 * cos(forceAngle - beltAngle)),
SbRotation(SbVec3f(0, 1, 0),
SbVec3f(-sin(forceAngle - beltAngle - M_PI_2), 0,
-cos(forceAngle - beltAngle - M_PI_2))));
createPlacement(sep, SbVec3f(0, dia / 8 + dia / 2 * rat2, 0), SbRotation());
sep->addChild(createArrow(dia / 8 + dia / 2 * rat2, dia / 8));
pShapeSep->addChild(sep);// child 4
}
} else if (strcmp(prop->getName(),"Diameter") == 0) {
}
else if (strcmp(prop->getName(), "Diameter") == 0) {
if (pShapeSep->getNumChildren() > 0) {
// Change the symbol
double radius = pcConstraint->Radius.getValue();
@@ -164,27 +169,37 @@ void ViewProviderFemConstraintPulley::updateData(const App::Property* prop)
double rat1 = 0.8, rat2 = 0.2;
double f1 = pcConstraint->BeltForce1.getValue();
double f2 = pcConstraint->BeltForce2.getValue();
if (f1+f2 > Precision::Confusion()) {
rat1 = f1 / (f1+f2);
rat2 = f2 / (f1+f2);
if (f1 + f2 > Precision::Confusion()) {
rat1 = f1 / (f1 + f2);
rat2 = f2 / (f1 + f2);
}
const SoSeparator* sep = static_cast<SoSeparator*>(pShapeSep->getChild(2));
updateCylinder(sep, 0, pcConstraint->Height.getValue() * 0.8, dia/2);
sep = static_cast<SoSeparator*>(pShapeSep->getChild(3));
updatePlacement(sep, 0, SbVec3f(dia/2 * sin(forceAngle+beltAngle), 0, dia/2 * cos(forceAngle+beltAngle)),
SbRotation(SbVec3f(0,1,0), SbVec3f(sin(forceAngle+beltAngle+M_PI_2),0,cos(forceAngle+beltAngle+M_PI_2))));
updatePlacement(sep, 2, SbVec3f(0, dia/8 + dia/2 * rat1, 0), SbRotation());
const SoSeparator* subsep = static_cast<SoSeparator*>(sep->getChild(4));
updateArrow(subsep, 0, dia/8 + dia/2 * rat1, dia/8);
sep = static_cast<SoSeparator*>(pShapeSep->getChild(4));
updatePlacement(sep, 0, SbVec3f(-dia/2 * sin(forceAngle-beltAngle), 0, -dia/2 * cos(forceAngle-beltAngle)),
SbRotation(SbVec3f(0,1,0), SbVec3f(-sin(forceAngle-beltAngle-M_PI_2),0,-cos(forceAngle-beltAngle-M_PI_2))));
updatePlacement(sep, 2, SbVec3f(0, dia/8 + dia/2 * rat2, 0), SbRotation());
subsep = static_cast<SoSeparator*>(sep->getChild(4));
updateArrow(subsep, 0, dia/8 + dia/2 * rat2, dia/8);
const SoSeparator *sep = static_cast<SoSeparator *>(pShapeSep->getChild(2));
updateCylinder(sep, 0, pcConstraint->Height.getValue() * 0.8, dia / 2);
sep = static_cast<SoSeparator *>(pShapeSep->getChild(3));
updatePlacement(sep, 0,
SbVec3f(dia / 2 * sin(forceAngle + beltAngle), 0,
dia / 2 * cos(forceAngle + beltAngle)),
SbRotation(SbVec3f(0, 1, 0),
SbVec3f(sin(forceAngle + beltAngle + M_PI_2), 0,
cos(forceAngle + beltAngle + M_PI_2))));
updatePlacement(sep, 2, SbVec3f(0, dia / 8 + dia / 2 * rat1, 0), SbRotation());
const SoSeparator *subsep = static_cast<SoSeparator *>(sep->getChild(4));
updateArrow(subsep, 0, dia / 8 + dia / 2 * rat1, dia / 8);
sep = static_cast<SoSeparator *>(pShapeSep->getChild(4));
updatePlacement(sep, 0,
SbVec3f(-dia / 2 * sin(forceAngle - beltAngle), 0,
-dia / 2 * cos(forceAngle - beltAngle)),
SbRotation(SbVec3f(0, 1, 0),
SbVec3f(-sin(forceAngle - beltAngle - M_PI_2), 0,
-cos(forceAngle - beltAngle - M_PI_2))));
updatePlacement(sep, 2, SbVec3f(0, dia / 8 + dia / 2 * rat2, 0), SbRotation());
subsep = static_cast<SoSeparator *>(sep->getChild(4));
updateArrow(subsep, 0, dia / 8 + dia / 2 * rat2, dia / 8);
}
} else if ((strcmp(prop->getName(), "ForceAngle") == 0) || (strcmp(prop->getName(), "BeltAngle") == 0)) {
}
else if ((strcmp(prop->getName(), "ForceAngle") == 0)
|| (strcmp(prop->getName(), "BeltAngle") == 0)) {
if (pShapeSep->getNumChildren() > 0) {
double radius = pcConstraint->Radius.getValue();
double dia = pcConstraint->Diameter.getValue();
@@ -193,14 +208,24 @@ void ViewProviderFemConstraintPulley::updateData(const App::Property* prop)
double forceAngle = pcConstraint->ForceAngle.getValue() / 180 * M_PI;
double beltAngle = pcConstraint->BeltAngle.getValue();
const SoSeparator* sep = static_cast<SoSeparator*>(pShapeSep->getChild(3));
updatePlacement(sep, 0, SbVec3f(dia/2 * sin(forceAngle+beltAngle), 0, dia/2 * cos(forceAngle+beltAngle)),
SbRotation(SbVec3f(0,1,0), SbVec3f(sin(forceAngle+beltAngle+M_PI_2),0,cos(forceAngle+beltAngle+M_PI_2))));
sep = static_cast<SoSeparator*>(pShapeSep->getChild(4));
updatePlacement(sep, 0, SbVec3f(-dia/2 * sin(forceAngle-beltAngle), 0, -dia/2 * cos(forceAngle-beltAngle)),
SbRotation(SbVec3f(0,1,0), SbVec3f(-sin(forceAngle-beltAngle-M_PI_2),0,-cos(forceAngle-beltAngle-M_PI_2))));
const SoSeparator *sep = static_cast<SoSeparator *>(pShapeSep->getChild(3));
updatePlacement(sep, 0,
SbVec3f(dia / 2 * sin(forceAngle + beltAngle), 0,
dia / 2 * cos(forceAngle + beltAngle)),
SbRotation(SbVec3f(0, 1, 0),
SbVec3f(sin(forceAngle + beltAngle + M_PI_2), 0,
cos(forceAngle + beltAngle + M_PI_2))));
sep = static_cast<SoSeparator *>(pShapeSep->getChild(4));
updatePlacement(sep, 0,
SbVec3f(-dia / 2 * sin(forceAngle - beltAngle), 0,
-dia / 2 * cos(forceAngle - beltAngle)),
SbRotation(SbVec3f(0, 1, 0),
SbVec3f(-sin(forceAngle - beltAngle - M_PI_2), 0,
-cos(forceAngle - beltAngle - M_PI_2))));
}
} else if ((strcmp(prop->getName(), "BeltForce1") == 0) || (strcmp(prop->getName(), "BeltForce2") == 0)) {
}
else if ((strcmp(prop->getName(), "BeltForce1") == 0)
|| (strcmp(prop->getName(), "BeltForce2") == 0)) {
if (pShapeSep->getNumChildren() > 0) {
double radius = pcConstraint->Radius.getValue();
double dia = pcConstraint->Diameter.getValue();
@@ -209,19 +234,19 @@ void ViewProviderFemConstraintPulley::updateData(const App::Property* prop)
double rat1 = 0.8, rat2 = 0.2;
double f1 = pcConstraint->BeltForce1.getValue();
double f2 = pcConstraint->BeltForce2.getValue();
if (f1+f2 > Precision::Confusion()) {
rat1 = f1 / (f1+f2);
rat2 = f2 / (f1+f2);
if (f1 + f2 > Precision::Confusion()) {
rat1 = f1 / (f1 + f2);
rat2 = f2 / (f1 + f2);
}
const SoSeparator* sep = static_cast<SoSeparator*>(pShapeSep->getChild(3));
updatePlacement(sep, 2, SbVec3f(0, dia/8 + dia/2 * rat1, 0), SbRotation());
const SoSeparator* subsep = static_cast<SoSeparator*>(sep->getChild(4));
updateArrow(subsep, 0, dia/8 + dia/2 * rat1, dia/8);
sep = static_cast<SoSeparator*>(pShapeSep->getChild(4));
updatePlacement(sep, 2, SbVec3f(0, dia/8 + dia/2 * rat2, 0), SbRotation());
subsep = static_cast<SoSeparator*>(sep->getChild(4));
updateArrow(subsep, 0, dia/8 + dia/2 * rat2, dia/8);
const SoSeparator *sep = static_cast<SoSeparator *>(pShapeSep->getChild(3));
updatePlacement(sep, 2, SbVec3f(0, dia / 8 + dia / 2 * rat1, 0), SbRotation());
const SoSeparator *subsep = static_cast<SoSeparator *>(sep->getChild(4));
updateArrow(subsep, 0, dia / 8 + dia / 2 * rat1, dia / 8);
sep = static_cast<SoSeparator *>(pShapeSep->getChild(4));
updatePlacement(sep, 2, SbVec3f(0, dia / 8 + dia / 2 * rat2, 0), SbRotation());
subsep = static_cast<SoSeparator *>(sep->getChild(4));
updateArrow(subsep, 0, dia / 8 + dia / 2 * rat2, dia / 8);
}
}