diff --git a/src/Mod/Fem/App/FemConstraintPulley.cpp b/src/Mod/Fem/App/FemConstraintPulley.cpp index 634857523b..e38fbf9703 100644 --- a/src/Mod/Fem/App/FemConstraintPulley.cpp +++ b/src/Mod/Fem/App/FemConstraintPulley.cpp @@ -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) diff --git a/src/Mod/Fem/Gui/PropertyFemMeshItem.h b/src/Mod/Fem/Gui/PropertyFemMeshItem.h index 5167ecfbc4..3131317b31 100644 --- a/src/Mod/Fem/Gui/PropertyFemMeshItem.h +++ b/src/Mod/Fem/Gui/PropertyFemMeshItem.h @@ -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; diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp index ec66db2e90..62dcf2af2c 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp +++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp @@ -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()); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp index 18ccfee64a..3ab281a1be 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp @@ -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); } } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp index 53b37d4615..f3ecc15cc7 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp index ec9a6fed57..1188984884 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp index 3ecbafb150..5e92634a2d 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintDisplacement.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp index d7e11187a1..df75f5493d 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp index ff9e25831f..b8f4b7f174 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintFluidBoundary.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp index 5892c496ed..0384e77fa4 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.cpp index 000b24fdae..d732023331 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintGear.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp index 2d92841528..67b5901d47 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.cpp index e70a5c6d37..96db29a990 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintInitialTemperature.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.cpp index 018cce2810..dfc88f6f28 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPlaneRotation.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp index b500bb784e..e7e769699a 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPressure.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.cpp index 9dfec05039..558f6fae36 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.cpp index dac1e81785..6353872888 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintSpring.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp index f23558b553..5ff8fcdc7a 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintTemperature.cpp @@ -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 } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp index 11fb93fdca..8ee4d8ac12 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp @@ -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(Scale.getValue());