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

FEM: Add unit test for new ConstraintRigidBody object

Browse Source
This commit is contained in:
Ajinkya Dahale
2022-11-05 16:39:27 +05:30
committed by Chris Hennes
parent 0a6a7155e5
commit 845c0e7bcd
8 changed files with 318 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/Mod/Fem/Gui/ViewProviderFemConstraintRigidBody.cpp
View File

@@ -23,11 +23,11 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QMessageBox>
# include <Inventor/SbRotation.h>
# include <Inventor/SbVec3f.h>
# include <Inventor/nodes/SoMultipleCopy.h>
# include <Inventor/nodes/SoSeparator.h>
#include <QMessageBox>
#include <Inventor/SbRotation.h>
#include <Inventor/SbVec3f.h>
#include <Inventor/nodes/SoMultipleCopy.h>
#include <Inventor/nodes/SoSeparator.h>
#endif
#include <Mod/Fem/App/FemConstraintRigidBody.h>
@@ -39,7 +39,8 @@
using namespace FemGui;
PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintRigidBody, FemGui::ViewProviderFemConstraintOnBoundary)
PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintRigidBody,
FemGui::ViewProviderFemConstraintOnBoundary)
ViewProviderFemConstraintRigidBody::ViewProviderFemConstraintRigidBody()
@@ -48,19 +49,20 @@ ViewProviderFemConstraintRigidBody::ViewProviderFemConstraintRigidBody()
}
ViewProviderFemConstraintRigidBody::~ViewProviderFemConstraintRigidBody()
{
}
{}
bool ViewProviderFemConstraintRigidBody::setEdit(int ModNum)
{
if (ModNum == ViewProvider::Default ) {
if (ModNum == ViewProvider::Default) {
// When double-clicking on the item for this constraint the
// object unsets and sets its edit mode without closing
// the task panel
Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
TaskDlgFemConstraintRigidBody *constrDlg = qobject_cast<TaskDlgFemConstraintRigidBody *>(dlg);
if (constrDlg && constrDlg->getConstraintView() != this)
constrDlg = nullptr; // another constraint left open its task panel
Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog();
TaskDlgFemConstraintRigidBody* constrDlg =
qobject_cast<TaskDlgFemConstraintRigidBody*>(dlg);
if (constrDlg && constrDlg->getConstraintView() != this) {
constrDlg = nullptr; // another constraint left open its task panel
}
if (dlg && !constrDlg) {
// This case will occur in the ShaftWizard application
checkForWizard();
@@ -72,15 +74,19 @@ bool ViewProviderFemConstraintRigidBody::setEdit(int ModNum)
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
if (ret == QMessageBox::Yes) {
Gui::Control().reject();
else
}
else {
return false;
} else if (constraintDialog) {
}
}
else if (constraintDialog) {
// Another FemConstraint* dialog is already open inside the Shaft Wizard
// Ignore the request to open another dialog
return false;
} else {
}
else {
constraintDialog = new TaskFemConstraintRigidBody(this);
return true;
}
@@ -90,44 +96,51 @@ bool ViewProviderFemConstraintRigidBody::setEdit(int ModNum)
Gui::Selection().clearSelection();
// start the edit dialog
if (constrDlg)
if (constrDlg) {
Gui::Control().showDialog(constrDlg);
else
}
else {
Gui::Control().showDialog(new TaskDlgFemConstraintRigidBody(this));
}
return true;
} else {
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
}
else {
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
}
}
#define WIDTH (2)
#define HEIGHT (1)
//#define USE_MULTIPLE_COPY //OvG: MULTICOPY fails to update scaled display on initial drawing - so disable
// #define USE_MULTIPLE_COPY //OvG: MULTICOPY fails to update scaled display on initial drawing -
// so disable
void ViewProviderFemConstraintRigidBody::updateData(const App::Property* prop)
{
// Gets called whenever a property of the attached object changes
Fem::ConstraintRigidBody *pcConstraint = static_cast<Fem::ConstraintRigidBody *>(this->getObject());
float scaledwidth = WIDTH * pcConstraint->Scale.getValue(); //OvG: Calculate scaled values once only
Fem::ConstraintRigidBody* pcConstraint =
static_cast<Fem::ConstraintRigidBody*>(this->getObject());
float scaledwidth =
WIDTH * pcConstraint->Scale.getValue(); // OvG: Calculate scaled values once only
float scaledheight = HEIGHT * pcConstraint->Scale.getValue();
#ifdef USE_MULTIPLE_COPY
//OvG: always need access to cp for scaling
// OvG: always need access to cp for scaling
SoMultipleCopy* cp = new SoMultipleCopy();
if (pShapeSep->getNumChildren() == 0) {
// Set up the nodes
cp->matrix.setNum(0);
cp->addChild((SoNode*)createRigidBody(scaledheight, scaledwidth)); //OvG: Scaling
cp->addChild((SoNode*)createRigidBody(scaledheight, scaledwidth)); // OvG: Scaling
pShapeSep->addChild(cp);
}
#endif
if (strcmp(prop->getName(),"Points") == 0) {
if (strcmp(prop->getName(), "Points") == 0) {
const std::vector<Base::Vector3d>& points = pcConstraint->Points.getValues();
const std::vector<Base::Vector3d>& normals = pcConstraint->Normals.getValues();
if (points.size() != normals.size())
if (points.size() != normals.size()) {
return;
}
std::vector<Base::Vector3d>::const_iterator n = normals.begin();
#ifdef USE_MULTIPLE_COPY
@@ -153,7 +166,7 @@ void ViewProviderFemConstraintRigidBody::updateData(const App::Property* prop)
#else
SoSeparator* sep = new SoSeparator();
createPlacement(sep, base, rot);
createFixed(sep, scaledheight, scaledwidth); //OvG: Scaling
createFixed(sep, scaledheight, scaledwidth); // OvG: Scaling
pShapeSep->addChild(sep);
#endif
n++;