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

Do not use a view provider's bounding box node when handling BoundBox selection style because it leads to some inconsistent behaviour.

Browse Source 
Instead let SoBoxSelectionRenderAction render the bounding box.
This commit is contained in:
wmayer
2018-10-26 00:39:15 +02:00
parent 8eb3e2a103
commit cfb04647b2
5 changed files with 173 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Gui/ViewProviderGeometryObject.cpp
View File

@@ -74,13 +74,15 @@ PROPERTY_SOURCE(Gui::ViewProviderGeometryObject, Gui::ViewProviderDragger)
const App::PropertyIntegerConstraint::Constraints intPercent = {0,100,1};
ViewProviderGeometryObject::ViewProviderGeometryObject() : pcBoundSwitch(0),pcBoundColor(0)
ViewProviderGeometryObject::ViewProviderGeometryObject()
: pcBoundSwitch(0)
, pcBoundColor(0)
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
bool randomColor = hGrp->GetBool("RandomColor", false);
float r,g,b;
if(randomColor){
if (randomColor){
float fMax = (float)RAND_MAX;
r = (float)rand()/fMax;
g = (float)rand()/fMax;
@@ -115,6 +117,10 @@ ViewProviderGeometryObject::ViewProviderGeometryObject() : pcBoundSwitch(0),pcBo
pcBoundingBox = new Gui::SoFCBoundingBox;
pcBoundingBox->ref();
pcBoundColor = new SoBaseColor();
pcBoundColor->ref();
sPixmap = "Feature";
}
@@ -122,6 +128,7 @@ ViewProviderGeometryObject::~ViewProviderGeometryObject()
{
pcShapeMaterial->unref();
pcBoundingBox->unref();
pcBoundColor->unref();
}
void ViewProviderGeometryObject::onChanged(const App::Property* prop)
@@ -163,10 +170,8 @@ void ViewProviderGeometryObject::onChanged(const App::Property* prop)
pcShapeMaterial->shininess.setValue(Mat.shininess);
pcShapeMaterial->transparency.setValue(Mat.transparency);
}
else if (prop == &BoundingBox || prop == &SelectionStyle) {
applyBoundColor();
if(SelectionStyle.getValue()==0 || !Selectable.getValue())
showBoundingBox( BoundingBox.getValue() );
else if (prop == &BoundingBox) {
showBoundingBox(BoundingBox.getValue());
}
ViewProviderDragger::onChanged(prop);
@@ -230,35 +235,28 @@ SoPickedPoint* ViewProviderGeometryObject::getPickedPoint(const SbVec2s& pos, co
return (pick ? new SoPickedPoint(*pick) : 0);
}
unsigned long ViewProviderGeometryObject::getBoundColor() const {
unsigned long ViewProviderGeometryObject::getBoundColor() const
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View");
if(SelectionStyle.getValue() == 0 || !Selectable.getValue() || !hGrp->GetBool("EnableSelection", true))
return hGrp->GetUnsigned("BoundingBoxColor",4294967295UL); // white (255,255,255)
else
return hGrp->GetUnsigned("SelectionColor",0x00CD00UL); // rgb(0,205,0)
}
void ViewProviderGeometryObject::applyBoundColor() {
if(!pcBoundColor) return;
unsigned long bbcol = getBoundColor();
float r,g,b;
r = ((bbcol >> 24) & 0xff) / 255.0; g = ((bbcol >> 16) & 0xff) / 255.0; b = ((bbcol >> 8) & 0xff) / 255.0;
pcBoundColor->rgb.setValue(r, g, b);
unsigned long bbcol = hGrp->GetUnsigned("BoundingBoxColor",4294967295UL); // white (255,255,255)
return bbcol;
}
void ViewProviderGeometryObject::showBoundingBox(bool show)
{
if (!pcBoundSwitch && show) {
unsigned long bbcol = getBoundColor();
float r,g,b;
r = ((bbcol >> 24) & 0xff) / 255.0; g = ((bbcol >> 16) & 0xff) / 255.0; b = ((bbcol >> 8) & 0xff) / 255.0;
pcBoundSwitch = new SoSwitch();
SoSeparator* pBoundingSep = new SoSeparator();
SoDrawStyle* lineStyle = new SoDrawStyle;
lineStyle->lineWidth = 2.0f;
pBoundingSep->addChild(lineStyle);
pcBoundColor = new SoBaseColor();
pcBoundColor->rgb.setValue(r, g, b);
pBoundingSep->addChild(pcBoundColor);
applyBoundColor();
pBoundingSep->addChild(new SoResetTransform());
pBoundingSep->addChild(pcBoundingBox);
@@ -267,7 +265,7 @@ void ViewProviderGeometryObject::showBoundingBox(bool show)
// add to the highlight node
pcBoundSwitch->addChild(pBoundingSep);
pcRoot->insertChild(pcBoundSwitch,pcRoot->findChild(pcModeSwitch));
pcRoot->addChild(pcBoundSwitch);
}
if (pcBoundSwitch) {
@@ -277,12 +275,6 @@ void ViewProviderGeometryObject::showBoundingBox(bool show)
void ViewProviderGeometryObject::setSelectable(bool selectable)
{
if(SelectionStyle.getValue()) {
applyBoundColor();
if(!selectable)
showBoundingBox(false);
}
SoSearchAction sa;
sa.setInterest(SoSearchAction::ALL);
sa.setSearchingAll(true);