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

fix origin plane and line viewprovider

Browse Source 
master changed the highlight code for viewproviders, needed an adjustement after rebase
This commit is contained in:
Stefan Tröger 2015-08-08 11:07:37 +02:00
parent cebc5860c1
commit 2a5d800940
4 changed files with 115 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/Gui/ViewProviderLine.cpp
View File

@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 *
* Copyright (c) J<EFBFBD>rgen Riegel (juergen.riegel@web.de) 2012 *
* *
* This file is part of the FreeCAD CAx development system. *
* *
@ -51,6 +51,7 @@
#include "View3DInventorViewer.h"
#include "Inventor/SoAutoZoomTranslation.h"
#include "SoAxisCrossKit.h"
#include "Window.h"
//#include <SoDepthBuffer.h>
#include <App/PropertyGeo.h>
@ -84,6 +85,12 @@ ViewProviderLine::ViewProviderLine()
0,1,-1
};
// Create the selection node
pcHighlight = createFromSettings();
pcHighlight->ref();
if (pcHighlight->selectionMode.getValue() == Gui::SoFCSelection::SEL_OFF)
Selectable.setValue(false);
pMat->diffuseColor.setNum(1);
pMat->diffuseColor.set1Value(0, SbColor(50./255., 150./255., 250./255.));
@ -113,6 +120,7 @@ ViewProviderLine::ViewProviderLine()
ViewProviderLine::~ViewProviderLine()
{
pcHighlight->unref();
pCoords->unref();
pLines->unref();
pMat->unref();
@ -157,6 +165,10 @@ void ViewProviderLine::attach(App::DocumentObject* pcObject)
{
ViewProviderGeometryObject::attach(pcObject);
pcHighlight->objectName = pcObject->getNameInDocument();
pcHighlight->documentName = pcObject->getDocument()->getName();
pcHighlight->subElementName = "Main";
SoSeparator *sep = new SoSeparator();
SoAnnotation *lineSep = new SoAnnotation();
@ -168,10 +180,10 @@ void ViewProviderLine::attach(App::DocumentObject* pcObject)
sep->addChild(matBinding);
sep->addChild(pMat);
// sep->addChild(getHighlightNode());
// pcHighlight->addChild(style);
// pcHighlight->addChild(pCoords);
// pcHighlight->addChild(pLines);
sep->addChild(pcHighlight);
pcHighlight->addChild(style);
pcHighlight->addChild(pCoords);
pcHighlight->addChild(pLines);
style = new SoDrawStyle();
style->lineWidth = 2.0f;
@ -182,9 +194,9 @@ void ViewProviderLine::attach(App::DocumentObject* pcObject)
pText->string.setValue(SbString(pcObject->Label.getValue()));
lineSep->addChild(pTranslation);
lineSep->addChild(pText);
// pcHighlight->addChild(lineSep);
//
// pcHighlight->style = SoFCSelection::EMISSIVE_DIFFUSE;
pcHighlight->addChild(lineSep);
pcHighlight->style = SoFCSelection::EMISSIVE_DIFFUSE;
addDisplayMaskMode(sep, "Base");
}
@ -241,6 +253,40 @@ void ViewProviderLine::unsetEdit(int ModNum)
}
Gui::SoFCSelection* ViewProviderLine::createFromSettings() const
{
Gui::SoFCSelection* sel = new Gui::SoFCSelection();
float transparency;
ParameterGrp::handle hGrp = Gui::WindowParameter::getDefaultParameter()->GetGroup("View");
bool enablePre = hGrp->GetBool("EnablePreselection", true);
bool enableSel = hGrp->GetBool("EnableSelection", true);
if (!enablePre) {
sel->highlightMode = Gui::SoFCSelection::OFF;
}
else {
// Search for a user defined value with the current color as default
SbColor highlightColor = sel->colorHighlight.getValue();
unsigned long highlight = (unsigned long)(highlightColor.getPackedValue());
highlight = hGrp->GetUnsigned("HighlightColor", highlight);
highlightColor.setPackedValue((uint32_t)highlight, transparency);
sel->colorHighlight.setValue(highlightColor);
}
if (!enableSel || !Selectable.getValue()) {
sel->selectionMode = Gui::SoFCSelection::SEL_OFF;
}
else {
// Do the same with the selection color
SbColor selectionColor = sel->colorSelection.getValue();
unsigned long selection = (unsigned long)(selectionColor.getPackedValue());
selection = hGrp->GetUnsigned("SelectionColor", selection);
selectionColor.setPackedValue((uint32_t)selection, transparency);
sel->colorSelection.setValue(selectionColor);
}
return sel;
}
// ----------------------------------------------------------------------------

3
src/Gui/ViewProviderLine.h
View File

@ -41,6 +41,7 @@ class SoFont;
namespace Gui
{
class SoFCSelection;
class GuiExport ViewProviderLine : public ViewProviderGeometryObject
{
@ -70,9 +71,11 @@ public:
virtual void unsetEdit(int ModNum);
protected:
SoFCSelection* createFromSettings() const;
void onChanged(const App::Property* prop);
private:
SoFCSelection * pcHighlight;
SoCoordinate3 * pCoords;
SoMaterial * pMat;
SoIndexedLineSet * pLines;

60
src/Gui/ViewProviderPlane.cpp
View File

@ -51,6 +51,7 @@
#include "View3DInventorViewer.h"
#include "Inventor/SoAutoZoomTranslation.h"
#include "SoAxisCrossKit.h"
#include "Window.h"
//#include <SoDepthBuffer.h>
#include <App/PropertyGeo.h>
@ -85,6 +86,13 @@ ViewProviderPlane::ViewProviderPlane()
0,1,2,3,0,-1
};
// Create the selection node
pcHighlight = createFromSettings();
pcHighlight->ref();
if (pcHighlight->selectionMode.getValue() == Gui::SoFCSelection::SEL_OFF)
Selectable.setValue(false);
pMat->diffuseColor.setNum(1);
pMat->diffuseColor.set1Value(0, SbColor(50./255., 150./255., 250./255.));
@ -112,6 +120,7 @@ ViewProviderPlane::ViewProviderPlane()
ViewProviderPlane::~ViewProviderPlane()
{
pcHighlight->unref();
pCoords->unref();
pLines->unref();
pMat->unref();
@ -155,9 +164,12 @@ void ViewProviderPlane::attach(App::DocumentObject* pcObject)
{
ViewProviderGeometryObject::attach(pcObject);
pcHighlight->objectName = pcObject->getNameInDocument();
pcHighlight->documentName = pcObject->getDocument()->getName();
pcHighlight->subElementName = "Main";
SoSeparator *sep = new SoSeparator();
SoAnnotation *lineSep = new SoAnnotation();
SoFCSelection *highlight = new SoFCSelection();
SoDrawStyle* style = new SoDrawStyle();
style->lineWidth = 2.0f;
@ -167,10 +179,10 @@ void ViewProviderPlane::attach(App::DocumentObject* pcObject)
sep->addChild(matBinding);
sep->addChild(pMat);
sep->addChild(highlight);
highlight->addChild(style);
highlight->addChild(pCoords);
highlight->addChild(pLines);
sep->addChild(pcHighlight);
pcHighlight->addChild(style);
pcHighlight->addChild(pCoords);
pcHighlight->addChild(pLines);
style = new SoDrawStyle();
style->lineWidth = 2.0f;
@ -181,9 +193,9 @@ void ViewProviderPlane::attach(App::DocumentObject* pcObject)
pText->string.setValue(SbString(pcObject->Label.getValue()));
lineSep->addChild(pTranslation);
lineSep->addChild(pText);
highlight->addChild(lineSep);
pcHighlight->addChild(lineSep);
highlight->style = SoFCSelection::EMISSIVE_DIFFUSE;
pcHighlight->style = SoFCSelection::EMISSIVE_DIFFUSE;
addDisplayMaskMode(sep, "Base");
}
@ -240,6 +252,40 @@ void ViewProviderPlane::unsetEdit(int ModNum)
}
Gui::SoFCSelection* ViewProviderPlane::createFromSettings() const
{
Gui::SoFCSelection* sel = new Gui::SoFCSelection();
float transparency;
ParameterGrp::handle hGrp = Gui::WindowParameter::getDefaultParameter()->GetGroup("View");
bool enablePre = hGrp->GetBool("EnablePreselection", true);
bool enableSel = hGrp->GetBool("EnableSelection", true);
if (!enablePre) {
sel->highlightMode = Gui::SoFCSelection::OFF;
}
else {
// Search for a user defined value with the current color as default
SbColor highlightColor = sel->colorHighlight.getValue();
unsigned long highlight = (unsigned long)(highlightColor.getPackedValue());
highlight = hGrp->GetUnsigned("HighlightColor", highlight);
highlightColor.setPackedValue((uint32_t)highlight, transparency);
sel->colorHighlight.setValue(highlightColor);
}
if (!enableSel || !Selectable.getValue()) {
sel->selectionMode = Gui::SoFCSelection::SEL_OFF;
}
else {
// Do the same with the selection color
SbColor selectionColor = sel->colorSelection.getValue();
unsigned long selection = (unsigned long)(selectionColor.getPackedValue());
selection = hGrp->GetUnsigned("SelectionColor", selection);
selectionColor.setPackedValue((uint32_t)selection, transparency);
sel->colorSelection.setValue(selectionColor);
}
return sel;
}
// ----------------------------------------------------------------------------

6
src/Gui/ViewProviderPlane.h
View File

@ -38,8 +38,10 @@ class SoMaterial;
class SoAsciiText;
class SoFont;
namespace Gui
namespace Gui
{
class SoFCSelection;
class GuiExport ViewProviderPlane : public ViewProviderGeometryObject
@ -70,9 +72,11 @@ public:
virtual void unsetEdit(int ModNum);
protected:
SoFCSelection* createFromSettings() const;
void onChanged(const App::Property* prop);
private:
SoFCSelection * pcHighlight;
SoCoordinate3 * pCoords;
SoMaterial * pMat;
SoIndexedLineSet * pLines;