Fem: [skip ci] Fix several clazy issues:
* Maybe you meant to call base method instead [-Wclazy-skipped-base-method] * Using copy-ctor but class SbMatrix has a trivial copy-ctor but non trivial assign operator [-Wclazy-rule-of-two-soft] * Missing emit keyword on signal call FemGui::PointMarker::PointsChanged [-Wclazy-incorrect-emit]
This commit is contained in:
@@ -56,7 +56,7 @@ ConstraintPulley::ConstraintPulley()
|
||||
"First belt force");
|
||||
ADD_PROPERTY_TYPE(BeltForce2,(0.0),"ConstraintPulley",App::PropertyType(App::Prop_ReadOnly|App::Prop_Output),
|
||||
"Second belt force");
|
||||
ForceAngle.setValue(00.0);
|
||||
ForceAngle.setValue(0.0);
|
||||
Diameter.setValue(300.0);
|
||||
// calculate initial values of read-only properties
|
||||
onChanged(&Force);
|
||||
@@ -64,7 +64,7 @@ ConstraintPulley::ConstraintPulley()
|
||||
|
||||
App::DocumentObjectExecReturn *ConstraintPulley::execute(void)
|
||||
{
|
||||
return ConstraintBearing::execute();
|
||||
return ConstraintGear::execute();
|
||||
}
|
||||
|
||||
void ConstraintPulley::onChanged(const App::Property* prop)
|
||||
|
||||
@@ -34,13 +34,13 @@ namespace FemGui {
|
||||
class PropertyFemMeshItem : public Gui::PropertyEditor::PropertyItem
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(int Nodes READ countNodes)
|
||||
Q_PROPERTY(int Edges READ countEdges)
|
||||
Q_PROPERTY(int Faces READ countFaces)
|
||||
Q_PROPERTY(int Polygons READ countPolygons)
|
||||
Q_PROPERTY(int Volumes READ countVolumes)
|
||||
Q_PROPERTY(int Polyhedrons READ countPolyhedrons)
|
||||
Q_PROPERTY(int Groups READ countGroups)
|
||||
Q_PROPERTY(int Nodes READ countNodes CONSTANT)
|
||||
Q_PROPERTY(int Edges READ countEdges CONSTANT)
|
||||
Q_PROPERTY(int Faces READ countFaces CONSTANT)
|
||||
Q_PROPERTY(int Polygons READ countPolygons CONSTANT)
|
||||
Q_PROPERTY(int Volumes READ countVolumes CONSTANT)
|
||||
Q_PROPERTY(int Polyhedrons READ countPolyhedrons CONSTANT)
|
||||
Q_PROPERTY(int Groups READ countGroups CONSTANT)
|
||||
PROPERTYITEM_HEADER
|
||||
|
||||
virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const;
|
||||
|
||||
@@ -100,7 +100,7 @@ void PointMarker::customEvent(QEvent*)
|
||||
const SbVec3f& pt2 = vp->pCoords->point[1];
|
||||
|
||||
if (!m_name.empty()) {
|
||||
PointsChanged(pt1[0], pt1[1], pt1[2], pt2[0], pt2[1], pt2[2]);
|
||||
Q_EMIT PointsChanged(pt1[0], pt1[1], pt1[2], pt2[0], pt2[1], pt2[2]);
|
||||
Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.%s.Point1 = App.Vector(%f, %f, %f)", m_name.c_str(), pt1[0], pt1[1], pt1[2]);
|
||||
Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.%s.Point2 = App.Vector(%f, %f, %f)", m_name.c_str(), pt2[0], pt2[1], pt2[2]);
|
||||
}
|
||||
@@ -168,7 +168,7 @@ void DataMarker::customEvent(QEvent*)
|
||||
const SbVec3f& pt1 = vp->pCoords->point[0];
|
||||
|
||||
if (!m_name.empty()) {
|
||||
PointsChanged(pt1[0], pt1[1], pt1[2]);
|
||||
Q_EMIT PointsChanged(pt1[0], pt1[1], pt1[2]);
|
||||
Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.%s.Center = App.Vector(%f, %f, %f)", m_name.c_str(), pt1[0], pt1[1], pt1[2]);
|
||||
}
|
||||
Gui::Command::doCommand(Gui::Command::Doc, ObjectInvisible().c_str());
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
|
||||
using namespace FemGui;
|
||||
|
||||
PROPERTY_SOURCE(FemGui::ViewProviderFemConstraint, Gui::ViewProviderDocumentObject)
|
||||
PROPERTY_SOURCE(FemGui::ViewProviderFemConstraint, Gui::ViewProviderGeometryObject)
|
||||
|
||||
|
||||
ViewProviderFemConstraint::ViewProviderFemConstraint()
|
||||
@@ -106,7 +106,7 @@ ViewProviderFemConstraint::~ViewProviderFemConstraint()
|
||||
|
||||
void ViewProviderFemConstraint::attach(App::DocumentObject* pcObject)
|
||||
{
|
||||
ViewProviderDocumentObject::attach(pcObject);
|
||||
ViewProviderGeometryObject::attach(pcObject);
|
||||
|
||||
SoPickStyle* ps = new SoPickStyle();
|
||||
ps->style = SoPickStyle::UNPICKABLE;
|
||||
@@ -147,7 +147,7 @@ void ViewProviderFemConstraint::setupContextMenu(QMenu* menu, QObject* receiver,
|
||||
QAction* act;
|
||||
act = menu->addAction(QObject::tr("Edit constraint"), receiver, member);
|
||||
act->setData(QVariant((int)ViewProvider::Default));
|
||||
ViewProviderDocumentObject::setupContextMenu(menu, receiver, member);
|
||||
ViewProviderDocumentObject::setupContextMenu(menu, receiver, member); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
|
||||
void ViewProviderFemConstraint::onChanged(const App::Property* prop)
|
||||
@@ -167,7 +167,7 @@ void ViewProviderFemConstraint::onChanged(const App::Property* prop)
|
||||
pFont->size = FontSize.getValue();
|
||||
}
|
||||
else {
|
||||
ViewProviderDocumentObject::onChanged(prop);
|
||||
ViewProviderDocumentObject::onChanged(prop); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
@@ -213,7 +213,7 @@ void ViewProviderFemConstraint::unsetEdit(int ModNum)
|
||||
Gui::Control().closeDialog();
|
||||
}
|
||||
else {
|
||||
ViewProviderDocumentObject::unsetEdit(ModNum);
|
||||
ViewProviderGeometryObject::unsetEdit(ModNum);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,7 +105,7 @@ bool ViewProviderFemConstraintBearing::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ bool ViewProviderFemConstraintContact::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -88,7 +88,7 @@ bool ViewProviderFemConstraintDisplacement::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -104,7 +104,7 @@ bool ViewProviderFemConstraintFixed::setEdit(int ModNum)
|
||||
|
||||
return true;
|
||||
} else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ bool ViewProviderFemConstraintFluidBoundary::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -104,7 +104,7 @@ bool ViewProviderFemConstraintForce::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -104,7 +104,7 @@ bool ViewProviderFemConstraintGear::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ bool ViewProviderFemConstraintHeatflux::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ bool ViewProviderFemConstraintInitialTemperature::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ bool ViewProviderFemConstraintPlaneRotation::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ bool ViewProviderFemConstraintPressure::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ bool ViewProviderFemConstraintPulley::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ bool ViewProviderFemConstraintSpring::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ bool ViewProviderFemConstraintTemperature::setEdit(int ModNum)
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
return ViewProviderDocumentObject::setEdit(ModNum);
|
||||
return ViewProviderDocumentObject::setEdit(ModNum); // clazy:exclude=skipped-base-method
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -442,7 +442,7 @@ void ViewProviderFemPostPlaneFunction::onChanged(const App::Property* prop)
|
||||
// get current matrix
|
||||
SbVec3f t, s;
|
||||
SbRotation r, so;
|
||||
SbMatrix matrix = getManipulator()->getDragger()->getMotionMatrix();
|
||||
SbMatrix matrix = getManipulator()->getDragger()->getMotionMatrix(); // clazy:exclude=rule-of-two-soft
|
||||
matrix.getTransform(t, r, s, so);
|
||||
|
||||
float scale = static_cast<float>(Scale.getValue());
|
||||
|
||||
Reference in New Issue
Block a user