committed by
Chris Hennes
parent
ce6275e163
commit
284c42dc0a
@@ -66,6 +66,7 @@ public:
|
||||
FC_VIEW_PARAM(AxisXColor,unsigned long,Unsigned,0xCC333300) \
|
||||
FC_VIEW_PARAM(AxisYColor,unsigned long,Unsigned,0x33CC3300) \
|
||||
FC_VIEW_PARAM(AxisZColor,unsigned long,Unsigned,0x3333CC00) \
|
||||
FC_VIEW_PARAM(DraggerScale,double,Float,0.03) \
|
||||
|
||||
|
||||
#undef FC_VIEW_PARAM
|
||||
|
||||
@@ -124,12 +124,13 @@ bool ViewProviderDragger::setEdit(int ModNum)
|
||||
{
|
||||
Q_UNUSED(ModNum);
|
||||
|
||||
if(checkLink())
|
||||
if (checkLink()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
App::DocumentObject *genericObject = this->getObject();
|
||||
if (genericObject->isDerivedFrom(App::GeoFeature::getClassTypeId()))
|
||||
{
|
||||
|
||||
if (genericObject->isDerivedFrom(App::GeoFeature::getClassTypeId())) {
|
||||
auto geoFeature = static_cast<App::GeoFeature *>(genericObject);
|
||||
const Base::Placement &placement = geoFeature->Placement.getValue();
|
||||
auto tempTransform = new SoTransform();
|
||||
@@ -143,7 +144,7 @@ bool ViewProviderDragger::setEdit(int ModNum)
|
||||
Gui::ViewParams::instance()->getAxisYColor(),
|
||||
Gui::ViewParams::instance()->getAxisZColor()
|
||||
);
|
||||
csysDragger->draggerSize.setValue(0.05f);
|
||||
csysDragger->draggerSize.setValue(ViewParams::instance()->getDraggerScale());
|
||||
csysDragger->translation.setValue(tempTransform->translation.getValue());
|
||||
csysDragger->rotation.setValue(tempTransform->rotation.getValue());
|
||||
|
||||
|
||||
@@ -2865,9 +2865,9 @@ void ViewProviderLink::setEditViewer(Gui::View3DInventorViewer* viewer, int ModN
|
||||
cube->depth = length;
|
||||
|
||||
viewer->setupEditingRoot(group,&dragCtx->preTransform);
|
||||
}else{
|
||||
} else {
|
||||
auto dragger = static_cast<SoFCCSysDragger*>(pcDragger.get());
|
||||
dragger->draggerSize.setValue(0.05f);
|
||||
dragger->draggerSize.setValue(ViewParams::instance()->getDraggerScale());
|
||||
dragger->setUpAutoScale(viewer->getSoRenderManager()->getCamera());
|
||||
viewer->setupEditingRoot(pcDragger,&dragCtx->preTransform);
|
||||
|
||||
|
||||
@@ -249,7 +249,7 @@ void ViewProviderAssembly::setDragger()
|
||||
asmDragger->setAxisColors(Gui::ViewParams::instance()->getAxisXColor(),
|
||||
Gui::ViewParams::instance()->getAxisYColor(),
|
||||
Gui::ViewParams::instance()->getAxisZColor());
|
||||
asmDragger->draggerSize.setValue(0.05f);
|
||||
asmDragger->draggerSize.setValue(Gui::ViewParams::instance()->getDraggerScale());
|
||||
|
||||
asmDraggerSwitch = new SoSwitch(SO_SWITCH_NONE);
|
||||
asmDraggerSwitch->addChild(asmDragger);
|
||||
|
||||
Reference in New Issue
Block a user