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

0023634: Eliminate Polyline and Polygon usage in drawers

Browse Source 
Polylines and polygons removed, now everything is based on PrimitiveArrays.
Added use of Graphic3d_ArrayOfSegments, some additional clean up in Graphic3d_Group.
Dead code elimination in AIS and V3d
Corrected compilation errors
Fixed grid presentation
Adding test case correction
This commit is contained in:
kgv
2013-01-18 13:36:18 +04:00
parent 44cf55e600
commit b8ddfc2f5d
134 changed files with 4369 additions and 9572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/AIS/AIS_InteractiveContext.cxx
View File

@@ -23,12 +23,11 @@
#define BUC60577 //GG_101099 Enable to compute correctly
// transparency with more than one object in the view.
#define GER61351 //GG_171199 Enable to set an object RGB color
// instead a restricted object NameOfColor.
//GER61351 //GG_171199 Enable to set an object RGB color instead a restricted object NameOfColor.
#define G003 //EUG_26/01/00 Degenerate support (G003)
#define IMP140200 //GG Add SetSelectedAspect() method.
//IMP140200 //GG Add SetSelectedAspect() method.
#define BUC60632 //GG 15/03/00 Add protection on SetDisplayMode()
// method, compute only authorized presentation.
@@ -1914,15 +1913,13 @@ UnsetDisplayMode(const Handle(AIS_InteractiveObject)& anIObj,
//purpose :
//=======================================================================
#ifdef GER61351
void AIS_InteractiveContext::SetCurrentFacingModel(
const Handle(AIS_InteractiveObject)& anIObj,
const Aspect_TypeOfFacingModel aModel) {
if ( !anIObj.IsNull () ) {
anIObj->SetCurrentFacingModel(aModel);
}
const Aspect_TypeOfFacingModel aModel)
{
if ( !anIObj.IsNull () )
anIObj->SetCurrentFacingModel(aModel);
}
#endif
//=======================================================================
//function : SetColor
@@ -1932,7 +1929,6 @@ void AIS_InteractiveContext::SetCurrentFacingModel(
void AIS_InteractiveContext::SetColor(const Handle(AIS_InteractiveObject)& anIObj,
const Quantity_NameOfColor aColor,
const Standard_Boolean updateviewer)
#ifdef GER61351
{
SetColor(anIObj,Quantity_Color(aColor),updateviewer);
}
@@ -1940,7 +1936,6 @@ void AIS_InteractiveContext::SetColor(const Handle(AIS_InteractiveObject)& anIOb
void AIS_InteractiveContext::SetColor(const Handle(AIS_InteractiveObject)& anIObj,
const Quantity_Color &aColor,
const Standard_Boolean updateviewer)
#endif
{
if(anIObj.IsNull()) return ;
@@ -2292,13 +2287,11 @@ Quantity_NameOfColor AIS_InteractiveContext::Color(const Handle(AIS_InteractiveO
return anIObj->Color();
}
#ifdef GER61351
void AIS_InteractiveContext::Color(const Handle(AIS_InteractiveObject)& anIObj,
Quantity_Color &aColor) const
Quantity_Color &aColor) const
{
anIObj->Color(aColor);
}
#endif
//=======================================================================
//function : Width
@@ -2541,7 +2534,6 @@ void AIS_InteractiveContext :: SetDegenerateModel (
} // end AIS_InteractiveContext :: SetDegenerateModel
#endif
#ifdef IMP140200
//=======================================================================
//function : SetSelectedAspect
//purpose :
@@ -2549,7 +2541,8 @@ void AIS_InteractiveContext :: SetDegenerateModel (
void AIS_InteractiveContext::SetSelectedAspect(
const Handle(Prs3d_BasicAspect)& anAspect,
const Standard_Boolean globalChange,
const Standard_Boolean updateViewer) {
const Standard_Boolean updateViewer)
{
if( !HasOpenedContext() ) {
Standard_Boolean found = Standard_False;
Handle(AIS_Selection) sel =
@@ -2563,11 +2556,10 @@ void AIS_InteractiveContext::SetSelectedAspect(
if( found && updateViewer) {
myMainVwr->Update();
if( !(myIsCollClosed && myCollectorVwr.IsNull()) )
myCollectorVwr->Update();
myCollectorVwr->Update();
}
}
}
#endif
//=======================================================================
//function : SetLocalAttributes