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

0023205: Patch for Naming improvement

Browse Source 
1). Added persistence.
2) Removed not supported evolution - Replace.
QADraw commands were fixed .
Added TKBO to EXTERNLIB.
Modified test case: caf named_shape F6
This commit is contained in:
szy
2012-08-31 15:26:23 +04:00
parent 09121745ad
commit 1ec8a59e23
21 changed files with 684 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx
View File

@@ -160,9 +160,9 @@ Standard_Boolean XmlMNaming_NamedShapeDriver::Paste
case TNaming_SELECTED:
aBld.Select(aNewShape, anOldShape);
break;
case TNaming_REPLACE:
aBld.Replace(anOldShape,aNewShape);
break;
// case TNaming_REPLACE:
// aBld.Replace(anOldShape,aNewShape);
// break;
default:
Standard_DomainError::Raise("TNaming_Evolution; enum term unknown");
}
@@ -248,7 +248,7 @@ static const XmlObjMgt_DOMString& EvolutionString(const TNaming_Evolution i)
case TNaming_MODIFY : return ::EvolModifyString();
case TNaming_DELETE : return ::EvolDeleteString();
case TNaming_SELECTED : return ::EvolSelectedString();
case TNaming_REPLACE : return ::EvolReplaceString();
// case TNaming_REPLACE : return ::EvolReplaceString();
default:
Standard_DomainError::Raise("TNaming_Evolution; enum term unknown");
}
@@ -274,7 +274,7 @@ static TNaming_Evolution EvolutionEnum (const XmlObjMgt_DOMString& theString)
else if (theString.equals (::EvolSelectedString()))
aResult = TNaming_SELECTED;
else if (theString.equals (::EvolReplaceString()))
aResult = TNaming_REPLACE;
aResult = TNaming_MODIFY; // for compatibility //TNaming_REPLACE;
else
Standard_DomainError::Raise
("TNaming_Evolution; string value without enum term equivalence");

6
src/XmlMNaming/XmlMNaming_NamingDriver.cxx
View File

@@ -52,7 +52,8 @@ IMPLEMENT_DOMSTRING (NTSubtractionString, "subtraction")
IMPLEMENT_DOMSTRING (NTConstShapeString, "constshape")
IMPLEMENT_DOMSTRING (NTFilterByNeighString, "filterbyneigh")
IMPLEMENT_DOMSTRING (NTOrientationString, "orientation")
IMPLEMENT_DOMSTRING (NTWireInString, "wirein")
IMPLEMENT_DOMSTRING (NTWireInString, "wirein")
IMPLEMENT_DOMSTRING (NTShellInString, "shellin")
IMPLEMENT_DOMSTRING (ShCompoundString, "compound")
IMPLEMENT_DOMSTRING (ShCompsolidString, "compsolid")
@@ -329,6 +330,7 @@ static const XmlObjMgt_DOMString& NameTypeToString (const TNaming_NameType theE)
case TNaming_FILTERBYNEIGHBOURGS : return ::NTFilterByNeighString();
case TNaming_ORIENTATION : return ::NTOrientationString();
case TNaming_WIREIN : return ::NTWireInString();
case TNaming_SHELLIN : return ::NTShellInString();
default:
Standard_DomainError::Raise("TNaming_NameType; enum term unknown ");
}
@@ -397,6 +399,8 @@ static TNaming_NameType NameTypeFromString (const XmlObjMgt_DOMString& theString
aResult = TNaming_ORIENTATION;
else if (theString.equals (::NTWireInString()))
aResult = TNaming_WIREIN;
else if (theString.equals (::NTShellInString()))
aResult = TNaming_SHELLIN;
else
Standard_DomainError::Raise
("TNaming_NameType; string value without enum term equivalence");