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 1

Browse Source 
- also sort includes
- also fix warnings about too long lines
This commit is contained in:
Uwe
2022-10-03 17:10:36 +02:00
parent ef62fc3530
commit 79d17d13bf
11 changed files with 401 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp
View File

@@ -23,24 +23,20 @@
* *
***************************************************************************/
#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 <Inventor/SbRotation.h>
# include <Inventor/SbVec3f.h>
# include <Inventor/nodes/SoMultipleCopy.h>
# include <Inventor/nodes/SoSeparator.h>
#endif
#include "Mod/Fem/App/FemConstraintDisplacement.h"
#include "TaskFemConstraintDisplacement.h"
#include "ViewProviderFemConstraintDisplacement.h"
#include <Base/Console.h>
#include <Gui/Control.h>
#include "ViewProviderFemConstraintDisplacement.h"
#include "TaskFemConstraintDisplacement.h"
using namespace FemGui;
@@ -49,7 +45,7 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintDisplacement, FemGui::ViewProvi
ViewProviderFemConstraintDisplacement::ViewProviderFemConstraintDisplacement()
{
sPixmap = "FEM_ConstraintDisplacement";
ADD_PROPERTY(FaceColor,(0.2f,0.3f,0.2f));
ADD_PROPERTY(FaceColor, (0.2f, 0.3f, 0.2f));
}
ViewProviderFemConstraintDisplacement::~ViewProviderFemConstraintDisplacement()
@@ -64,7 +60,8 @@ bool ViewProviderFemConstraintDisplacement::setEdit(int ModNum)
// object unsets and sets its edit mode without closing
// the task panel
Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
TaskDlgFemConstraintDisplacement *constrDlg = qobject_cast<TaskDlgFemConstraintDisplacement *>(dlg);
TaskDlgFemConstraintDisplacement *constrDlg =
qobject_cast<TaskDlgFemConstraintDisplacement *>(dlg);
if (constrDlg && constrDlg->getConstraintView() != this)
constrDlg = nullptr; // another constraint left open its task panel
if (dlg && !constrDlg) {
@@ -99,7 +96,8 @@ bool ViewProviderFemConstraintDisplacement::setEdit(int ModNum)
void ViewProviderFemConstraintDisplacement::updateData(const App::Property* prop)
{
// Gets called whenever a property of the attached object changes
Fem::ConstraintDisplacement* pcConstraint = static_cast<Fem::ConstraintDisplacement*>(this->getObject());
Fem::ConstraintDisplacement *pcConstraint =
static_cast<Fem::ConstraintDisplacement *>(this->getObject());
float scaledwidth = WIDTH * pcConstraint->Scale.getValue(); //OvG: Calculate scaled values once only
float scaledheight = HEIGHT * pcConstraint->Scale.getValue();
bool xFree = pcConstraint->xFree.getValue();
@@ -189,107 +187,96 @@ void ViewProviderFemConstraintDisplacement::updateData(const App::Property* prop
Gui::coinRemoveAllChildren(pShapeSep);
#endif
for (std::vector<Base::Vector3d>::const_iterator p = points.begin(); p != points.end(); p++) {
for (std::vector<Base::Vector3d>::const_iterator p = points.begin(); p != points.end();
p++) {
SbVec3f base(p->x, p->y, p->z);
SbVec3f dirx(1,0,0); //OvG: Make relevant to global axes
SbVec3f diry(0,1,0); //OvG: Make relevant to global axes
SbVec3f dirz(0,0,1); //OvG: Make relevant to global axes
SbRotation rotx(SbVec3f(0,-1,0), dirx); //OvG Tri-cones
SbRotation roty(SbVec3f(0,-1,0), diry);
SbRotation rotz(SbVec3f(0,-1,0), dirz);
SbVec3f dirx(1, 0, 0); //OvG: Make relevant to global axes
SbVec3f diry(0, 1, 0); //OvG: Make relevant to global axes
SbVec3f dirz(0, 0, 1); //OvG: Make relevant to global axes
SbRotation rotx(SbVec3f(0, -1, 0), dirx);//OvG Tri-cones
SbRotation roty(SbVec3f(0, -1, 0), diry);
SbRotation rotz(SbVec3f(0, -1, 0), dirz);
#ifdef USE_MULTIPLE_COPY
SbMatrix mx;
SbMatrix my;
SbMatrix mz;
//OvG: Translation indication
if(!xFree)
{
if (!xFree) {
SbMatrix mx;
mx.setTransform(base, rotx, SbVec3f(1,1,1));
mx.setTransform(base, rotx, SbVec3f(1, 1, 1));
matricesx[idx] = mx;
idx++;
}
if(!yFree)
{
if (!yFree) {
SbMatrix my;
my.setTransform(base, roty, SbVec3f(1,1,1));
my.setTransform(base, roty, SbVec3f(1, 1, 1));
matricesy[idy] = my;
idy++;
}
if(!zFree)
{
if (!zFree) {
SbMatrix mz;
mz.setTransform(base, rotz, SbVec3f(1,1,1));
mz.setTransform(base, rotz, SbVec3f(1, 1, 1));
matricesz[idz] = mz;
idz++;
}
//OvG: Rotation indication
if(!rotxFree)
{
if (!rotxFree) {
SbMatrix mrotx;
mrotx.setTransform(base, rotx, SbVec3f(1,1,1));
mrotx.setTransform(base, rotx, SbVec3f(1, 1, 1));
matricesrotx[idrotx] = mrotx;
idrotx++;
}
if(!rotyFree)
{
if (!rotyFree) {
SbMatrix mroty;
mroty.setTransform(base, roty, SbVec3f(1,1,1));
mroty.setTransform(base, roty, SbVec3f(1, 1, 1));
matricesroty[idroty] = mroty;
idroty++;
}
if(!rotzFree)
{
if (!rotzFree) {
SbMatrix mrotz;
mrotz.setTransform(base, rotz, SbVec3f(1,1,1));
mrotz.setTransform(base, rotz, SbVec3f(1, 1, 1));
matricesrotz[idrotz] = mrotz;
idrotz++;
}
#else
//OvG: Translation indication
if(!xFree)
{
SoSeparator* sepx = new SoSeparator();
if (!xFree) {
SoSeparator *sepx = new SoSeparator();
createPlacement(sepx, base, rotx);
createDisplacement(sepx, scaledheight, scaledwidth); //OvG: Scaling
createDisplacement(sepx, scaledheight, scaledwidth);//OvG: Scaling
pShapeSep->addChild(sepx);
}
if(!yFree)
{
SoSeparator* sepy = new SoSeparator();
if (!yFree) {
SoSeparator *sepy = new SoSeparator();
createPlacement(sepy, base, roty);
createDisplacement(sepy, scaledheight, scaledwidth); //OvG: Scaling
createDisplacement(sepy, scaledheight, scaledwidth);//OvG: Scaling
pShapeSep->addChild(sepy);
}
if(!zFree)
{
SoSeparator* sepz = new SoSeparator();
if (!zFree) {
SoSeparator *sepz = new SoSeparator();
createPlacement(sepz, base, rotz);
createDisplacement(sepz, scaledheight, scaledwidth); //OvG: Scaling
createDisplacement(sepz, scaledheight, scaledwidth);//OvG: Scaling
pShapeSep->addChild(sepz);
}
//OvG: Rotation indication
if(!rotxFree)
{
SoSeparator* sepx = new SoSeparator();
if (!rotxFree) {
SoSeparator *sepx = new SoSeparator();
createPlacement(sepx, base, rotx);
createRotation(sepx, scaledheight, scaledwidth); //OvG: Scaling
createRotation(sepx, scaledheight, scaledwidth);//OvG: Scaling
pShapeSep->addChild(sepx);
}
if(!rotyFree)
{
SoSeparator* sepy = new SoSeparator();
if (!rotyFree) {
SoSeparator *sepy = new SoSeparator();
createPlacement(sepy, base, roty);
createRotation(sepy, scaledheight, scaledwidth); //OvG: Scaling
createRotation(sepy, scaledheight, scaledwidth);//OvG: Scaling
pShapeSep->addChild(sepy);
}
if(!rotzFree)
{
SoSeparator* sepz = new SoSeparator();
if (!rotzFree) {
SoSeparator *sepz = new SoSeparator();
createPlacement(sepz, base, rotz);
createRotation(sepz, scaledheight, scaledwidth); //OvG: Scaling
createRotation(sepz, scaledheight, scaledwidth);//OvG: Scaling
pShapeSep->addChild(sepz);
}
#endif