diff --git a/src/Mod/PartDesign/App/FeatureTransformed.cpp b/src/Mod/PartDesign/App/FeatureTransformed.cpp index c74e7bb17c..aa2f551c93 100644 --- a/src/Mod/PartDesign/App/FeatureTransformed.cpp +++ b/src/Mod/PartDesign/App/FeatureTransformed.cpp @@ -62,8 +62,8 @@ extern bool getPDRefineModelParameter(); PROPERTY_SOURCE(PartDesign::Transformed, PartDesign::FeatureRefine) -std::array transformModeEnums = {"Transform tool shapes", - "Transform body", +std::array transformModeEnums = {"Features", + "Whole shape", nullptr}; Transformed::Transformed() @@ -72,7 +72,7 @@ Transformed::Transformed() Originals.setSize(0); Placement.setStatus(App::Property::ReadOnly, true); - ADD_PROPERTY(TransformMode, (static_cast(Mode::TransformToolShapes))); + ADD_PROPERTY(TransformMode, (static_cast(Mode::Features))); TransformMode.setEnums(transformModeEnums.data()); } @@ -119,7 +119,7 @@ std::vector Transformed::getOriginals() const { auto const mode = static_cast(TransformMode.getValue()); - if (mode == Mode::TransformBody) { + if (mode == Mode::WholeShape) { return {}; } @@ -248,11 +248,11 @@ App::DocumentObjectExecReturn* Transformed::recomputePreview() }; switch (mode) { - case Mode::TransformToolShapes: + case Mode::Features: PreviewShape.setValue(makeCompoundOfToolShapes()); return StdReturn; - case Mode::TransformBody: + case Mode::WholeShape: PreviewShape.setValue(getBaseShape()); return StdReturn; @@ -265,7 +265,7 @@ void Transformed::onChanged(const App::Property* prop) { if (prop == &TransformMode) { auto const mode = static_cast(TransformMode.getValue()); - Originals.setStatus(App::Property::Status::Hidden, mode == Mode::TransformBody); + Originals.setStatus(App::Property::Status::Hidden, mode == Mode::WholeShape); } FeatureRefine::onChanged(prop); @@ -281,7 +281,7 @@ App::DocumentObjectExecReturn* Transformed::execute() std::vector originals = getOriginals(); - if (mode == Mode::TransformToolShapes && originals.empty()) { + if (mode == Mode::Features && originals.empty()) { return App::DocumentObject::StdReturn; } @@ -350,7 +350,7 @@ App::DocumentObjectExecReturn* Transformed::execute() }; switch (mode) { - case Mode::TransformToolShapes: + case Mode::Features: // NOTE: It would be possible to build a compound from all original addShapes/subShapes // and then transform the compounds as a whole. But we choose to apply the // transformations to each Original separately. This way it is easier to discover what @@ -398,7 +398,7 @@ App::DocumentObjectExecReturn* Transformed::execute() } } break; - case Mode::TransformBody: { + case Mode::WholeShape: { auto shapes = getTransformedCompShape(supportShape, supportShape); if (OCCTProgressIndicator::getAppIndicator().UserBreak()) { return new App::DocumentObjectExecReturn("User aborted"); diff --git a/src/Mod/PartDesign/App/FeatureTransformed.h b/src/Mod/PartDesign/App/FeatureTransformed.h index 6e0321c697..ce830c0e26 100644 --- a/src/Mod/PartDesign/App/FeatureTransformed.h +++ b/src/Mod/PartDesign/App/FeatureTransformed.h @@ -44,8 +44,8 @@ class PartDesignExport Transformed: public PartDesign::FeatureRefine public: enum class Mode { - TransformToolShapes, - TransformBody + Features, + WholeShape }; Transformed(); diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index b89fa45711..5df71477e4 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -1942,7 +1942,7 @@ void prepareTransformed(PartDesign::Body *pcActiveBody, Gui::Command* cmd, const auto Feat = pcActiveBody->getDocument()->getObject(FeatName.c_str()); if (features.empty()) { - FCMD_OBJ_CMD(Feat, "TransformMode = \"Transform body\""); + FCMD_OBJ_CMD(Feat, "TransformMode = \"Whole shape\""); } else { std::stringstream str; str << "Originals = ["; diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index 02d16efb38..6d100d1730 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -125,8 +125,8 @@ void TaskTransformedParameters::setupUI() using Mode = PartDesign::Transformed::Mode; - ui->buttonGroupMode->setId(ui->radioTransformBody, static_cast(Mode::TransformBody)); - ui->buttonGroupMode->setId(ui->radioTransformToolShapes, static_cast(Mode::TransformToolShapes)); + ui->buttonGroupMode->setId(ui->radioTransformBody, static_cast(Mode::WholeShape)); + ui->buttonGroupMode->setId(ui->radioTransformToolShapes, static_cast(Mode::Features)); connect(ui->buttonGroupMode, &QButtonGroup::idClicked, @@ -134,12 +134,12 @@ void TaskTransformedParameters::setupUI() &TaskTransformedParameters::onModeChanged); auto const mode = static_cast(pcTransformed->TransformMode.getValue()); - ui->groupFeatureList->setEnabled(mode == Mode::TransformToolShapes); + ui->groupFeatureList->setEnabled(mode == Mode::Features); switch (mode) { - case Mode::TransformBody: + case Mode::WholeShape: ui->radioTransformBody->setChecked(true); break; - case Mode::TransformToolShapes: + case Mode::Features: ui->radioTransformToolShapes->setChecked(true); break; } @@ -307,8 +307,8 @@ void TaskTransformedParameters::onModeChanged(int mode_id) using Mode = PartDesign::Transformed::Mode; Mode const mode = static_cast(mode_id); - ui->groupFeatureList->setEnabled(mode == Mode::TransformToolShapes); - if (mode == Mode::TransformBody) { + ui->groupFeatureList->setEnabled(mode == Mode::Features); + if (mode == Mode::WholeShape) { ui->listWidgetFeatures->clear(); } setupTransaction();