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

Part Design: Remove legacy/modern workflow checks.

Browse Source
This commit is contained in:
PaddleStroke
2024-10-23 11:01:12 +02:00
committed by Chris Hennes
parent 56ae35b0f2
commit b1d5d4c105
7 changed files with 21 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Mod/PartDesign/Gui/Command.cpp
View File

@@ -1104,8 +1104,6 @@ void CmdPartDesignPad::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
prepareProfileBased(this, "Pad", 10.0);
}
@@ -1136,8 +1134,6 @@ void CmdPartDesignPocket::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
prepareProfileBased(this, "Pocket", 5.0);
}
@@ -1168,8 +1164,6 @@ void CmdPartDesignHole::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -1215,8 +1209,6 @@ void CmdPartDesignRevolution::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -1274,8 +1266,6 @@ void CmdPartDesignGroove::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -1341,8 +1331,6 @@ void CmdPartDesignAdditivePipe::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -1392,8 +1380,6 @@ void CmdPartDesignSubtractivePipe::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -1443,8 +1429,6 @@ void CmdPartDesignAdditiveLoft::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -1494,8 +1478,6 @@ void CmdPartDesignSubtractiveLoft::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -1544,8 +1526,6 @@ void CmdPartDesignAdditiveHelix::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -1621,8 +1601,6 @@ void CmdPartDesignSubtractiveHelix::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -1666,8 +1644,6 @@ bool dressupGetSelected(Gui::Command* cmd, const std::string& which,
{
// No PartDesign feature without Body past FreeCAD 0.16
App::Document *doc = cmd->getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return false;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -2053,8 +2029,6 @@ void CmdPartDesignMirrored::activated(int iMsg)
Q_UNUSED(iMsg);
// No PartDesign feature without Body past FreeCAD 0.16
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -2108,8 +2082,6 @@ void CmdPartDesignLinearPattern::activated(int iMsg)
Q_UNUSED(iMsg);
// No PartDesign feature without Body past FreeCAD 0.16
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -2165,8 +2137,6 @@ void CmdPartDesignPolarPattern::activated(int iMsg)
Q_UNUSED(iMsg);
// No PartDesign feature without Body past FreeCAD 0.16
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -2223,8 +2193,6 @@ void CmdPartDesignScaled::activated(int iMsg)
{
Q_UNUSED(iMsg);
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);
@@ -2269,8 +2237,6 @@ void CmdPartDesignMultiTransform::activated(int iMsg)
Q_UNUSED(iMsg);
// No PartDesign feature without Body past FreeCAD 0.16
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);

9
src/Mod/PartDesign/Gui/CommandBody.cpp
View File

@@ -95,9 +95,6 @@ CmdPartDesignBody::CmdPartDesignBody()
void CmdPartDesignBody::activated(int iMsg)
{
Q_UNUSED(iMsg);
// if user decides for old-style workflow then abort the command
if (PartDesignGui::assureLegacyWorkflow(getDocument()))
return;
App::Part *actPart = PartDesignGui::getActivePart ();
App::Part* partOfBaseFeature = nullptr;
@@ -301,7 +298,7 @@ void CmdPartDesignBody::activated(int iMsg)
bool CmdPartDesignBody::isActive()
{
return hasActiveDocument() && !PartDesignGui::isLegacyWorkflow ( getDocument () );
return hasActiveDocument();
}
//===========================================================================
@@ -826,7 +823,7 @@ void CmdPartDesignMoveFeature::activated(int iMsg)
bool CmdPartDesignMoveFeature::isActive()
{
return hasActiveDocument () && !PartDesignGui::isLegacyWorkflow ( getDocument () );
return hasActiveDocument();
}
DEF_STD_CMD_A(CmdPartDesignMoveFeatureInTree)
@@ -977,7 +974,7 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg)
bool CmdPartDesignMoveFeatureInTree::isActive()
{
return hasActiveDocument () && !PartDesignGui::isLegacyWorkflow ( getDocument () );
return hasActiveDocument();
}

4
src/Mod/PartDesign/Gui/CommandPrimitive.cpp
View File

@@ -76,8 +76,6 @@ CmdPrimtiveCompAdditive::CmdPrimtiveCompAdditive()
void CmdPrimtiveCompAdditive::activated(int iMsg)
{
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
// We need either an active Body, or for there to be no Body objects
// (in which case, just make one) to make a new additive shape.
@@ -251,8 +249,6 @@ CmdPrimtiveCompSubtractive::CmdPrimtiveCompSubtractive()
void CmdPrimtiveCompSubtractive::activated(int iMsg)
{
App::Document *doc = getDocument();
if (!PartDesignGui::assureModernWorkflow(doc))
return;
PartDesign::Body *pcActiveBody = PartDesignGui::getBody(true);

49
src/Mod/PartDesign/Gui/SketchWorkflow.cpp
View File

@@ -667,12 +667,24 @@ void SketchWorkflow::createSketch()
void SketchWorkflow::tryCreateSketch()
{
if (PartDesignGui::assureModernWorkflow(appdocument)) {
createSketchWithModernWorkflow();
auto result = shouldCreateBody();
auto shouldMakeBody = std::get<0>(result);
activeBody = std::get<1>(result);
if (shouldAbort(shouldMakeBody)) {
return;
}
// No PartDesign feature without Body past FreeCAD 0.13
else if (PartDesignGui::isLegacyWorkflow(appdocument)) {
createSketchWithLegacyWorkflow();
auto faceOrPlaneFilter = getFaceAndPlaneFilter();
SketchPreselection sketchOnFace{ guidocument, activeBody, faceOrPlaneFilter };
if (sketchOnFace.matches()) {
// create Sketch on Face or Plane
sketchOnFace.createSupport();
sketchOnFace.createSketchOnSupport(sketchOnFace.getSupport());
}
else {
SketchRequestSelection requestSelection{ guidocument, activeBody };
requestSelection.findSupport();
}
}
@@ -727,31 +739,4 @@ std::tuple<Gui::SelectionFilter, Gui::SelectionFilter> SketchWorkflow::getFaceAn
return std::make_tuple(FaceFilter, PlaneFilter);
}
void SketchWorkflow::createSketchWithModernWorkflow()
{
auto result = shouldCreateBody();
auto shouldMakeBody = std::get<0>(result);
activeBody = std::get<1>(result);
if (shouldAbort(shouldMakeBody)) {
return;
}
auto faceOrPlaneFilter = getFaceAndPlaneFilter();
SketchPreselection sketchOnFace{guidocument, activeBody, faceOrPlaneFilter};
if (sketchOnFace.matches()) {
// create Sketch on Face or Plane
sketchOnFace.createSupport();
sketchOnFace.createSketchOnSupport(sketchOnFace.getSupport());
}
else {
SketchRequestSelection requestSelection{guidocument, activeBody};
requestSelection.findSupport();
}
}
void SketchWorkflow::createSketchWithLegacyWorkflow()
{
Gui::CommandManager& cmdMgr = Gui::Application::Instance->commandManager();
cmdMgr.runCommandByName("Sketcher_NewSketch");
}

2
src/Mod/PartDesign/Gui/SketchWorkflow.h
View File

@@ -48,8 +48,6 @@ public:
private:
void tryCreateSketch();
void createSketchWithModernWorkflow();
void createSketchWithLegacyWorkflow();
std::tuple<bool, PartDesign::Body*> shouldCreateBody();
bool shouldAbort(bool) const;
std::tuple<Gui::SelectionFilter, Gui::SelectionFilter> getFaceAndPlaneFilter() const;

2
src/Mod/PartDesign/Gui/Utils.cpp
View File

@@ -120,7 +120,7 @@ PartDesign::Body *getBody(bool messageIfNot, bool autoActivate, bool assertModer
if (activeView) {
auto doc = activeView->getAppDocument();
bool singleBodyDocument = doc->countObjectsOfType(PartDesign::Body::getClassTypeId()) == 1;
if (assertModern && PartDesignGui::assureModernWorkflow (doc) ) {
if (assertModern) {
activeBody = activeView->getActiveObject<PartDesign::Body*>(PDBODYKEY,topParent,subname);
if (!activeBody && singleBodyDocument && autoActivate) {

7
src/Mod/PartDesign/Gui/Workbench.cpp
View File

@@ -83,13 +83,6 @@ void Workbench::setupContextMenu(const char* recipient, Gui::MenuItem* item) con
App::DocumentObject *feature = selection.front().pObject;
PartDesign::Body *body = nullptr;
// if PD workflow is not new-style then add a command to the context-menu
bool assertModern = true;
if (feature && !isModernWorkflow(feature->getDocument())) {
assertModern = false;
*item << "PartDesign_Migrate";
}
body = PartDesignGui::getBodyFor (feature, false, false, assertModern);
// lote of assertion so feature should be marked as a tip
if ( selection.size () == 1 && feature && (