OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-08 14:17:06 +03:00
Code Activity

0032186: PMI Visualization - PMIImportSavedView ignores assigned pmi

Browse Source 
Fixed invalid setting View
Annotations & Notes links were ignored by XCAF
This commit is contained in:
dpasukhi
2021-04-22 22:40:44 +03:00
parent 1294d5e39e
commit f5b7a266ca
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/XCAFDoc/XCAFDoc_ViewTool.cxx
View File

@@ -167,19 +167,19 @@ void XCAFDoc_ViewTool::SetView(const TDF_LabelSequence& theShapes,
}
if (theViewL.FindAttribute(XCAFDoc::ViewRefNoteGUID(), aChGNode)) {
while (aChGNode->NbFathers() > 0) {
aPlaneGNode = aChGNode->GetFather(1);
aPlaneGNode->UnSetChild(aChGNode);
if (aPlaneGNode->NbChildren() == 0)
aPlaneGNode->ForgetAttribute(XCAFDoc::ViewRefNoteGUID());
aNoteGNode = aChGNode->GetFather(1);
aNoteGNode->UnSetChild(aChGNode);
if (aNoteGNode->NbChildren() == 0)
aNoteGNode->ForgetAttribute(XCAFDoc::ViewRefNoteGUID());
}
theViewL.ForgetAttribute(XCAFDoc::ViewRefNoteGUID());
}
if (theViewL.FindAttribute(XCAFDoc::ViewRefAnnotationGUID(), aChGNode)) {
while (aChGNode->NbFathers() > 0) {
aPlaneGNode = aChGNode->GetFather(1);
aPlaneGNode->UnSetChild(aChGNode);
if (aPlaneGNode->NbChildren() == 0)
aPlaneGNode->ForgetAttribute(XCAFDoc::ViewRefAnnotationGUID());
aAnnotGNode = aChGNode->GetFather(1);
aAnnotGNode->UnSetChild(aChGNode);
if (aAnnotGNode->NbChildren() == 0)
aAnnotGNode->ForgetAttribute(XCAFDoc::ViewRefAnnotationGUID());
}
theViewL.ForgetAttribute(XCAFDoc::ViewRefAnnotationGUID());
}
@@ -235,7 +235,7 @@ void XCAFDoc_ViewTool::SetView(const TDF_LabelSequence& theShapes,
if (!theViewL.FindAttribute(XCAFDoc::ViewRefNoteGUID(), aChGNode) && theNotes.Length() > 0) {
aChGNode = new XCAFDoc_GraphNode;
aChGNode = XCAFDoc_GraphNode::Set(theViewL);
aChGNode->SetGraphID(XCAFDoc::ViewRefPlaneGUID());
aChGNode->SetGraphID(XCAFDoc::ViewRefNoteGUID());
}
for (Standard_Integer i = theNotes.Lower(); i <= theNotes.Upper(); i++)
{
@@ -255,9 +255,9 @@ void XCAFDoc_ViewTool::SetView(const TDF_LabelSequence& theShapes,
}
for (Standard_Integer i = theAnnotations.Lower(); i <= theAnnotations.Upper(); i++)
{
if (!theAnnotations.Value(i).FindAttribute(XCAFDoc::ViewRefAnnotationGUID(), aNoteGNode)) {
if (!theAnnotations.Value(i).FindAttribute(XCAFDoc::ViewRefAnnotationGUID(), aAnnotGNode)) {
aAnnotGNode = new XCAFDoc_GraphNode;
aAnnotGNode = XCAFDoc_GraphNode::Set(theNotes.Value(i));
aAnnotGNode = XCAFDoc_GraphNode::Set(theAnnotations.Value(i));
}
aAnnotGNode->SetGraphID(XCAFDoc::ViewRefAnnotationGUID());
aAnnotGNode->SetChild(aChGNode);

6
src/XDEDRAW/XDEDRAW.cxx
View File

@@ -1134,6 +1134,12 @@ static Standard_Integer XAttributeValue (Draw_Interpretor& di, Standard_Integer
else if (att->ID() == XCAFDoc::ViewRefPlaneGUID()) {
type = "View Clipping Plane Link";
}
else if (att->ID() == XCAFDoc::ViewRefNoteGUID()) {
type = "View Note Link";
}
else if (att->ID() == XCAFDoc::ViewRefAnnotationGUID()) {
type = "View Annotation Link";
}
else return 0;
Handle(XCAFDoc_GraphNode) DETGN = Handle(XCAFDoc_GraphNode)::DownCast(att);