move feature pick dialog into the task view

This commit is contained in:
Stefan Tröger
2015-05-06 06:04:15 +02:00
parent c4f5d790be
commit d5d6b30af3
11 changed files with 782 additions and 297 deletions

View File

@@ -63,11 +63,11 @@ using namespace Gui;
PROPERTY_SOURCE(Gui::ViewProviderLine, Gui::ViewProviderGeometryObject)
ViewProviderLine::ViewProviderLine()
ViewProviderLine::ViewProviderLine()
{
ADD_PROPERTY(Size,(1.0));
pMat = new SoMaterial();
pMat->ref();
@@ -96,16 +96,16 @@ ViewProviderLine::ViewProviderLine()
pLines->ref();
pLines->coordIndex.setNum(3);
pLines->coordIndex.setValues(0, 3, lines);
pFont = new SoFont();
pFont->size.setValue(Size.getValue()/10.);
pTranslation = new SoTranslation();
pTranslation->translation.setValue(SbVec3f(-1,0,0));
pText = new SoAsciiText();
pText->width.setValue(-1);
sPixmap = "view-measurement";
}
@@ -161,26 +161,26 @@ void ViewProviderLine::attach(App::DocumentObject* pcObject)
SoMaterialBinding* matBinding = new SoMaterialBinding;
matBinding->value = SoMaterialBinding::OVERALL;
sep->addChild(matBinding);
sep->addChild(pMat);
sep->addChild(getHighlightNode());
pcHighlight->addChild(style);
pcHighlight->addChild(pCoords);
pcHighlight->addChild(pLines);
// sep->addChild(getHighlightNode());
// pcHighlight->addChild(style);
// pcHighlight->addChild(pCoords);
// pcHighlight->addChild(pLines);
style = new SoDrawStyle();
style->lineWidth = 2.0f;
style->linePattern.setValue(0x00FF);
lineSep->addChild(style);
lineSep->addChild(pLines);
lineSep->addChild(pFont);
lineSep->addChild(pFont);
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");
}
@@ -209,7 +209,7 @@ std::string ViewProviderLine::getElement(const SoDetail* detail) const
SoDetail* ViewProviderLine::getDetail(const char* subelement) const
{
SoLineDetail* detail = 0;
std::string subelem(subelement);
std::string subelem(subelement);
int edge = -1;
if(subelem == "Main") edge = 0;
@@ -222,7 +222,7 @@ SoDetail* ViewProviderLine::getDetail(const char* subelement) const
return detail;
}
bool ViewProviderLine::isSelectable(void) const
bool ViewProviderLine::isSelectable(void) const
{
return true;
}
@@ -234,7 +234,7 @@ bool ViewProviderLine::setEdit(int ModNum)
void ViewProviderLine::unsetEdit(int ModNum)
{
}
// ----------------------------------------------------------------------------