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

[TD]lint removal

Browse Source
This commit is contained in:
wandererfan
2025-02-10 19:38:00 -05:00
committed by WandererFan
parent 9ee3bd5629
commit ae38fb51e2
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/TechDraw/Gui/QGIViewDimension.cpp
View File

@@ -1439,20 +1439,20 @@ void QGIViewDimension::resetArrows() const
aHead2->setFlipped(false);
}
// NOLINTNEXTLINE
void QGIViewDimension::drawArrows(int count, const Base::Vector2d positions[], double angles[],
bool flipped, bool forcePoint) const
{
const int arrowCount = 2;
QGIArrow* arrows[arrowCount] = {aHead1, aHead2};
constexpr int arrowCount{2};
QGIArrow* arrows[arrowCount] = {aHead1, aHead2}; // NOLINT
arrowPositionsToFeature(positions);
for (int i = 0; i < arrowCount; ++i) {
QGIArrow* arrow = arrows[i];
QGIArrow* arrow = arrows[i]; // NOLINT
if (positions && angles) {
arrow->setPos(toQtGui(positions[i]));
arrow->setDirection(toQtRad(angles[i]));
arrow->setPos(toQtGui(positions[i])); // NOLINT
arrow->setDirection(toQtRad(angles[i])); // NOLINT
}
if (i >= count) {
@@ -1466,7 +1466,7 @@ void QGIViewDimension::drawArrows(int count, const Base::Vector2d positions[], d
}
// some dimensions must use point ends (area). The point style is 3.
arrow->setStyle(forcePoint ? static_cast<long>(ArrowType::DOT) : vp->ArrowStyle.getValue());
arrow->setStyle(forcePoint ? ArrowType::DOT : static_cast<int>(vp->ArrowStyle.getValue()));
auto arrowSize = vp->Arrowsize.getValue();
arrow->setSize(arrowSize);
arrow->setFlipped(flipped);

40
src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
View File

@@ -56,6 +56,7 @@
using namespace TechDrawGui;
using namespace TechDraw;
// NOLINTBEGIN
const char *ViewProviderDimension::StandardAndStyleEnums[]=
{ "ISO Oriented", "ISO Referencing", "ASME Inlined", "ASME Referencing", nullptr };
@@ -63,6 +64,7 @@ const char *ViewProviderDimension::RenderingExtentEnums[]=
{ "None", "Minimal", "Confined", "Reduced", "Normal", "Expanded", nullptr };
PROPERTY_SOURCE(TechDrawGui::ViewProviderDimension, TechDrawGui::ViewProviderDrawingView)
// NOLINTEND
//**************************************************************************
// Construction/Destruction
@@ -82,7 +84,7 @@ ViewProviderDimension::ViewProviderDimension()
group, (App::PropertyType)(App::Prop_None),
"Arrow size in units");
ArrowStyle.setEnums(ArrowPropEnum::ArrowTypeEnums);
ArrowStyle.setEnums(ArrowPropEnum::ArrowTypeEnums); // NOLINT
ADD_PROPERTY_TYPE(ArrowStyle, (PreferencesGui::dimArrowStyle()),
group, (App::PropertyType)(App::Prop_None),
"Arrow end symbol - point, filled arrow, etc");
@@ -92,11 +94,11 @@ ViewProviderDimension::ViewProviderDimension()
ADD_PROPERTY_TYPE(Color, (prefColor()), group, App::Prop_None, "Color of the dimension");
ADD_PROPERTY_TYPE(StandardAndStyle, (prefStandardAndStyle()), group, App::Prop_None,
"Standard and style according to which dimension is drawn");
StandardAndStyle.setEnums(StandardAndStyleEnums);
StandardAndStyle.setEnums(StandardAndStyleEnums); // NOLINT
ADD_PROPERTY_TYPE(RenderingExtent, (REND_EXTENT_NORMAL), group, App::Prop_None,
"Select the rendering mode by space requirements");
RenderingExtent.setEnums(RenderingExtentEnums);
RenderingExtent.setEnums(RenderingExtentEnums); // NOLINT
ADD_PROPERTY_TYPE(FlipArrowheads, (false), group, App::Prop_None,
"Reverses usual direction of dimension line terminators");
ADD_PROPERTY_TYPE(GapFactorISO, (Preferences::GapISO()), group, App::Prop_None,
@@ -115,7 +117,7 @@ void ViewProviderDimension::attach(App::DocumentObject *pcFeat)
// call parent attach method
ViewProviderDrawingView::attach(pcFeat);
// sPixmap = "TechDraw_Dimension";
// sPixmap = "TechDraw_Dimension";
setPixmapForType();
if (getViewObject()->isDerivedFrom<TechDraw::LandmarkDimension>()) {
sPixmap = "TechDraw_LandmarkDimension";
@@ -131,7 +133,8 @@ bool ViewProviderDimension::doubleClicked()
void ViewProviderDimension::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
auto* func = new Gui::ActionFunction(menu);
QAction* act = menu->addAction(QObject::tr("Edit %1").arg(QString::fromUtf8(getObject()->Label.getValue())));
QAction* act = menu->addAction(
QObject::tr("Edit %1").arg(QString::fromUtf8(getObject()->Label.getValue())));
act->setData(QVariant((int)ViewProvider::Default));
func->trigger(act, [this](){
this->startDefaultEditMode();
@@ -165,19 +168,14 @@ void ViewProviderDimension::updateData(const App::Property* prop)
//Dimension handles X, Y updates differently that other QGIView
//call QGIViewDimension::updateView
if (prop == &(getViewObject()->X) ||
prop == &(getViewObject()->Y) ||
prop == &(getViewObject()->FormatSpec) ||
prop == &(getViewObject()->Arbitrary) ||
prop == &(getViewObject()->FormatSpecOverTolerance) ||
prop == &(getViewObject()->FormatSpecUnderTolerance) ||
prop == &(getViewObject()->ArbitraryTolerances) ||
prop == &(getViewObject()->MeasureType) ||
prop == &(getViewObject()->TheoreticalExact) ||
prop == &(getViewObject()->EqualTolerance) ||
prop == &(getViewObject()->OverTolerance) ||
prop == &(getViewObject()->UnderTolerance) ||
prop == &(getViewObject()->Inverted) ) {
if (prop == &(getViewObject()->X) || prop == &(getViewObject()->Y)
|| prop == &(getViewObject()->FormatSpec) || prop == &(getViewObject()->Arbitrary)
|| prop == &(getViewObject()->FormatSpecOverTolerance)
|| prop == &(getViewObject()->FormatSpecUnderTolerance)
|| prop == &(getViewObject()->ArbitraryTolerances)
|| prop == &(getViewObject()->MeasureType) || prop == &(getViewObject()->TheoreticalExact)
|| prop == &(getViewObject()->EqualTolerance) || prop == &(getViewObject()->OverTolerance)
|| prop == &(getViewObject()->UnderTolerance) || prop == &(getViewObject()->Inverted)) {
QGIView* qgiv = getQView();
if (qgiv) {
@@ -187,7 +185,7 @@ void ViewProviderDimension::updateData(const App::Property* prop)
}
//Skip QGIView X, Y processing - do not call ViewProviderDrawingView
Gui::ViewProviderDocumentObject::updateData(prop);
Gui::ViewProviderDocumentObject::updateData(prop); //NOLINT
}
void ViewProviderDimension::setPixmapForType()
@@ -214,6 +212,7 @@ void ViewProviderDimension::onChanged(const App::Property* prop)
if ((prop == &Font) ||
(prop == &Fontsize) ||
(prop == &Arrowsize) ||
(prop == &ArrowStyle) ||
(prop == &LineWidth) ||
(prop == &StandardAndStyle) ||
(prop == &RenderingExtent) ||
@@ -271,7 +270,8 @@ double ViewProviderDimension::prefWeight() const
int ViewProviderDimension::prefStandardAndStyle() const
{
return Preferences::getPreferenceGroup("Dimensions")->GetInt("StandardAndStyle", STD_STYLE_ISO_ORIENTED);
return static_cast<int>(
Preferences::getPreferenceGroup("Dimensions")->GetInt("StandardAndStyle", STD_STYLE_ISO_ORIENTED));
}
void ViewProviderDimension::handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property *prop)

10
src/Mod/TechDraw/Gui/ViewProviderDimension.h
View File

@@ -70,11 +70,11 @@ public:
App::PropertyFloat GapFactorASME;
App::PropertyFloat LineSpacingFactorISO;
void attach(App::DocumentObject *) override;
void attach(App::DocumentObject *pcFeat) override;
bool useNewSelectionModel() const override {return false;}
void updateData(const App::Property*) override;
void updateData(const App::Property* prop) override;
void onChanged(const App::Property* p) override;
void setupContextMenu(QMenu*, QObject*, const char*) override;
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
bool setEdit(int ModNum) override;
bool doubleClicked() override;
bool onDelete(const std::vector<std::string> & parms) override;
@@ -98,8 +98,8 @@ protected:
void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop) override;
private:
static const char *StandardAndStyleEnums[];
static const char *RenderingExtentEnums[];
static const char *StandardAndStyleEnums[]; // NOLINT
static const char *RenderingExtentEnums[]; // NOLINT
};