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

Assembly: Fix edit mode to allow users to transform the assembly.

Browse Source
This commit is contained in:
PaddleStroke
2024-07-15 17:11:56 +02:00
committed by Chris Hennes
parent 31493fa0ce
commit 22bdbcad11
1 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/Mod/Assembly/Gui/ViewProviderAssembly.cpp
View File

@@ -190,55 +190,61 @@ bool ViewProviderAssembly::canDragObjectToTarget(App::DocumentObject* obj,
return true;
}
bool ViewProviderAssembly::setEdit(int ModNum)
bool ViewProviderAssembly::setEdit(int mode)
{
Q_UNUSED(ModNum);
if (mode == ViewProvider::Default) {
// Set the part as 'Activated' ie bold in the tree.
Gui::Command::doCommand(Gui::Command::Gui,
"appDoc = App.getDocument('%s')\n"
"Gui.getDocument(appDoc).ActiveView.setActiveObject('%s', "
"appDoc.getObject('%s'))",
this->getObject()->getDocument()->getName(),
PARTKEY,
this->getObject()->getNameInDocument());
// Set the part as 'Activated' ie bold in the tree.
Gui::Command::doCommand(Gui::Command::Gui,
"appDoc = App.getDocument('%s')\n"
"Gui.getDocument(appDoc).ActiveView.setActiveObject('%s', "
"appDoc.getObject('%s'))",
this->getObject()->getDocument()->getName(),
PARTKEY,
this->getObject()->getNameInDocument());
// When we set edit, we update the grounded joints placements to support :
// - If user transformed the grounded object
// - For nested assemblies where the grounded object moves around.
auto* assembly = static_cast<AssemblyObject*>(getObject());
assembly->updateGroundedJointsPlacements();
// When we set edit, we update the grounded joints placements to support :
// - If user transformed the grounded object
// - For nested assemblies where the grounded object moves around.
auto* assembly = static_cast<AssemblyObject*>(getObject());
assembly->updateGroundedJointsPlacements();
setDragger();
setDragger();
attachSelection();
attachSelection();
return true;
}
return true;
return ViewProviderPart::setEdit(mode);
}
void ViewProviderAssembly::unsetEdit(int ModNum)
void ViewProviderAssembly::unsetEdit(int mode)
{
Q_UNUSED(ModNum);
canStartDragging = false;
partMoving = false;
docsToMove.clear();
if (mode == ViewProvider::Default) {
canStartDragging = false;
partMoving = false;
docsToMove.clear();
unsetDragger();
unsetDragger();
detachSelection();
detachSelection();
// Check if the view is still active before trying to deactivate the assembly.
auto activeView = getDocument()->getActiveView();
if (!activeView) {
// Check if the view is still active before trying to deactivate the assembly.
auto activeView = getDocument()->getActiveView();
if (!activeView) {
return;
}
// Set the part as not 'Activated' ie not bold in the tree.
Gui::Command::doCommand(Gui::Command::Gui,
"appDoc = App.getDocument('%s')\n"
"Gui.getDocument(appDoc).ActiveView.setActiveObject('%s', None)",
this->getObject()->getDocument()->getName(),
PARTKEY);
return;
}
// Set the part as not 'Activated' ie not bold in the tree.
Gui::Command::doCommand(Gui::Command::Gui,
"appDoc = App.getDocument('%s')\n"
"Gui.getDocument(appDoc).ActiveView.setActiveObject('%s', None)",
this->getObject()->getDocument()->getName(),
PARTKEY);
ViewProviderPart::unsetEdit(mode);
}
void ViewProviderAssembly::setDragger()
@@ -318,6 +324,10 @@ bool ViewProviderAssembly::keyPressed(bool pressed, int key)
bool ViewProviderAssembly::mouseMove(const SbVec2s& cursorPos, Gui::View3DInventorViewer* viewer)
{
if (!isInEditMode()) {
return false;
}
// Initialize or cancel the dragging of parts
if (canStartDragging) {
canStartDragging = false;
@@ -449,6 +459,10 @@ bool ViewProviderAssembly::mouseButtonPressed(int Button,
Q_UNUSED(cursorPos);
Q_UNUSED(viewer);
if (!isInEditMode()) {
return false;
}
// Left Mouse button ****************************************************
if (Button == 1) {
if (pressed && !getDraggerVisibility()) {
@@ -970,6 +984,10 @@ void ViewProviderAssembly::setDraggerVisibility(bool val)
}
bool ViewProviderAssembly::getDraggerVisibility()
{
if (!isInEditMode()) {
return false;
}
return asmDraggerSwitch->whichChild.getValue() == SO_SWITCH_ALL;
}