diff --git a/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp b/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp index 1f3016927d..40a24c4237 100644 --- a/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp +++ b/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp @@ -136,8 +136,6 @@ void ViewProviderAssembly::setupContextMenu(QMenu* menu, QObject* receiver, cons bool ViewProviderAssembly::doubleClicked() { if (isInEditMode()) { - // Part is already 'Active' so we exit edit mode. - // Gui::Command::doCommand(Gui::Command::Gui, "Gui.activeDocument().resetEdit()"); getDocument()->resetEdit(); } else { @@ -165,7 +163,6 @@ bool ViewProviderAssembly::canDragObject(App::DocumentObject* obj) const if (!obj || obj->getTypeId() == Assembly::JointGroup::getClassTypeId()) { return false; } - return true; } @@ -214,7 +211,6 @@ bool ViewProviderAssembly::canDragObjectToTarget(App::DocumentObject* obj, joint->getNameInDocument()); } } - return true; } @@ -245,7 +241,6 @@ bool ViewProviderAssembly::setEdit(int mode) return true; } - return ViewProviderPart::setEdit(mode); } @@ -257,7 +252,6 @@ void ViewProviderAssembly::unsetEdit(int mode) docsToMove.clear(); unsetDragger(); - detachSelection(); // Check if the view is still active before trying to deactivate the assembly. @@ -274,7 +268,6 @@ void ViewProviderAssembly::unsetEdit(int mode) PARTKEY); return; } - ViewProviderPart::unsetEdit(mode); } @@ -325,7 +318,6 @@ App::DocumentObject* ViewProviderAssembly::getActivePart() const if (!activeView) { return nullptr; } - return activeView->getActiveObject(PARTKEY); } @@ -347,7 +339,6 @@ bool ViewProviderAssembly::keyPressed(bool pressed, int key) if (key == SoKeyboardEvent::LEFT_CONTROL || key == SoKeyboardEvent::RIGHT_CONTROL) { ctrlPressed = pressed; } - return false; // handle all other key events } @@ -412,14 +403,12 @@ bool ViewProviderAssembly::tryMouseMove(const SbVec2s& cursorPos, Gui::View3DInv newPos = Base::Vector3d(vec[0], vec[1], vec[2]); } - for (auto& objToMove : docsToMove) { App::DocumentObject* obj = objToMove.obj; auto* propPlacement = dynamic_cast(obj->getPropertyByName("Placement")); if (propPlacement) { Base::Placement plc = objToMove.plc; - // Base::Console().Warning("newPos %f %f %f\n", newPos.x, newPos.y, newPos.z); if (dragMode == DragMode::RotationOnPlane) { Base::Vector3d center = jcsGlobalPlc.getPosition(); @@ -427,7 +416,6 @@ bool ViewProviderAssembly::tryMouseMove(const SbVec2s& cursorPos, Gui::View3DInv jcsGlobalPlc.getRotation().multVec(Base::Vector3d(0., 0., -1.)); double angle = (newPosRot - center).GetAngleOriented(initialPositionRot - center, norm); - // Base::Console().Warning("angle %f\n", angle); Base::Rotation zRotation = Base::Rotation(Base::Vector3d(0., 0., 1.), angle); Base::Placement rotatedGlovalJcsPlc = jcsGlobalPlc * Base::Placement(Base::Vector3d(), zRotation); @@ -455,7 +443,6 @@ bool ViewProviderAssembly::tryMouseMove(const SbVec2s& cursorPos, Gui::View3DInv boost::ignore_unused(projInitialPositionRot); double angle = (newPosRot - center).GetAngleOriented(initialPositionRot - center, norm); - // Base::Console().Warning("angle %f\n", angle); Base::Rotation zRotation = Base::Rotation(Base::Vector3d(0., 0., 1.), angle); Base::Placement rotatedGlovalJcsPlc = newJcsGlobalPlc * Base::Placement(Base::Vector3d(), zRotation); @@ -470,7 +457,6 @@ bool ViewProviderAssembly::tryMouseMove(const SbVec2s& cursorPos, Gui::View3DInv Base::Vector3d delta = newPos - prevPosition; Base::Vector3d pos = propPlacement->getValue().getPosition() + delta; - // Base::Vector3d pos = newPos + (plc.getPosition() - initialPosition); plc.setPosition(pos); } propPlacement->setValue(plc); @@ -484,7 +470,6 @@ bool ViewProviderAssembly::tryMouseMove(const SbVec2s& cursorPos, Gui::View3DInv "User parameter:BaseApp/Preferences/Mod/Assembly"); bool solveOnMove = hGrp->GetBool("SolveOnMove", true); if (solveOnMove && dragMode != DragMode::TranslationNoSolve) { - // assemblyPart->solve(/*enableRedo = */ false, /*updateJCS = */ false); assemblyPart->doDragStep(); } else { @@ -546,7 +531,6 @@ bool ViewProviderAssembly::mouseButtonPressed(int Button, } } } - return false; } @@ -589,7 +573,6 @@ bool ViewProviderAssembly::canDragObjectIn3d(App::DocumentObject* obj) const return true; } } - return false; } @@ -688,9 +671,6 @@ bool ViewProviderAssembly::getSelectedObjectsWithinAssembly(bool addPreselection // it is not selected at that point. So we need to get the preselection too. if (addPreselection && Gui::Selection().hasPreselection()) { - // Base::Console().Warning("Gui::Selection().getPreselection().pSubName %s\n", - // Gui::Selection().getPreselection().pSubName); - App::DocumentObject* selRoot = Gui::Selection().getPreselection().Object.getObject(); std::string sub = Gui::Selection().getPreselection().pSubName; @@ -1140,7 +1120,6 @@ bool ViewProviderAssembly::canDelete(App::DocumentObject* objBeingDeleted) const joint->getNameInDocument()); } } - return res; }