suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fixes #0002150: [Ctrl]+[Z] is buffered in a non-intuitive way, does not function in 'edit mode'

Browse Source
This commit is contained in:
wmayer 2015-09-15 14:30:15 +02:00
parent 7dc59751cc
commit b28680f3d8
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Gui/ViewProviderGeometryObject.cpp
View File

@ -71,7 +71,7 @@ PROPERTY_SOURCE(Gui::ViewProviderGeometryObject, Gui::ViewProviderDocumentObject
const App::PropertyIntegerConstraint::Constraints intPercent = {0,100,1};
ViewProviderGeometryObject::ViewProviderGeometryObject() : pcBoundSwitch(0)
ViewProviderGeometryObject::ViewProviderGeometryObject() : m_dragStart(false), pcBoundSwitch(0)
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
unsigned long shcol = hGrp->GetUnsigned("DefaultShapeColor",3435973887UL); // light gray (204,204,204)
@ -186,6 +186,27 @@ void ViewProviderGeometryObject::updateData(const App::Property* prop)
pcTransform->translation.setValue(px,py,pz);
pcTransform->center.setValue(0.0f,0.0f,0.0f);
pcTransform->scaleFactor.setValue(1.0f,1.0f,1.0f);
// If this view provider is in edit mode also check whether it has
// an SoCenterballManip that must be updated (#0002150)
if (isEditing() && !m_dragStart) {
SoSearchAction sa;
sa.setType(SoCenterballManip::getClassTypeId());
sa.setInterest(SoSearchAction::FIRST);
sa.apply(pcRoot);
SoPath * path = sa.getPath();
if (path) {
// check if the name matches to avoid to get any other manipulator
SoCenterballManip * manip = static_cast<SoCenterballManip*>(path->getTail());
if (manip->getName() == SbName("ViewProviderGeometryObject")) {
manip->rotation.setValue(q0,q1,q2,q3);
manip->translation.setValue(px,py,pz);
manip->center.setValue(0.0f,0.0f,0.0f);
manip->scaleFactor.setValue(1.0f,1.0f,1.0f);
}
}
}
}
}
@ -212,6 +233,7 @@ bool ViewProviderGeometryObject::setEdit(int ModNum)
SoPath * path = sa.getPath();
if (path) {
SoCenterballManip * manip = new SoCenterballManip;
manip->setName("ViewProviderGeometryObject");
SoDragger* dragger = manip->getDragger();
dragger->addStartCallback(dragStartCallback, this);
dragger->addFinishCallback(dragFinishCallback, this);
@ -468,7 +490,7 @@ void ViewProviderGeometryObject::dragMotionCallback(void * data, SoDragger * d)
t -= c;
newPlm.setPosition(t);
// #0001441: entering Transform mode degrades the Placemens rotation to single precision
// #0001441: entering Transform mode degrades the Placement rotation to single precision
Base::Placement oldPlm = geometry->Placement.getValue();
const Base::Vector3d& p1 = oldPlm.getPosition();
const Base::Vector3d& p2 = newPlm.getPosition();
@ -495,12 +517,16 @@ void ViewProviderGeometryObject::dragStartCallback(void *data, SoDragger *)
{
// This is called when a manipulator is about to manipulating
Gui::Application::Instance->activeDocument()->openCommand("Transform");
ViewProviderGeometryObject* view = reinterpret_cast<ViewProviderGeometryObject*>(data);
view->m_dragStart = true;
}
void ViewProviderGeometryObject::dragFinishCallback(void *data, SoDragger *)
{
// This is called when a manipulator has done manipulating
Gui::Application::Instance->activeDocument()->commitCommand();
ViewProviderGeometryObject* view = reinterpret_cast<ViewProviderGeometryObject*>(data);
view->m_dragStart = false;
}
SoPickedPointList ViewProviderGeometryObject::getPickedPoints(const SbVec2s& pos, const View3DInventorViewer& viewer,bool pickAll) const

1
src/Gui/ViewProviderGeometryObject.h
View File

@ -104,6 +104,7 @@ private:
static void dragStartCallback(void * data, SoDragger * d);
static void dragFinishCallback(void * data, SoDragger * d);
static void dragMotionCallback(void * data, SoDragger * d);
bool m_dragStart;
protected:
SoMaterial * pcShapeMaterial;