OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-16 10:08:36 +03:00
Code

0025765: Coding rules - clean up code from obsolete macro checks

Browse Source 
Unused code paths (including definition of these macros and meaningless comments) were eliminated.
This commit is contained in:
apn 2015-02-24 19:27:20 +03:00 committed by bugmaster
parent f1b0b4f9c6
commit d2094e110f
130 changed files with 11 additions and 1775 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/AIS/AIS_Axis.cdl
View File

@ -14,9 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
class Axis from AIS inherits InteractiveObject from AIS
---Purpose: Locates the x, y and z axes in an Interactive Object.

2
src/AIS/AIS_Axis.cxx
View File

@ -14,8 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
//GER61351 //GG_171199 Enable to set an object RGB color instead a restricted object NameOfColor.
#include <AIS_Axis.ixx>
#include <Aspect_TypeOfLine.hxx>
#include <Prs3d_Drawer.hxx>

13
src/AIS/AIS_Chamf2dDimension.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60915 //GG 05/06/01 Enable to compute the requested arrow size
// if any in all dimensions.
#include <Standard_NotImplemented.hxx>
#include <AIS_Chamf2dDimension.ixx>
@ -99,11 +96,7 @@ AIS_Chamf2dDimension::AIS_Chamf2dDimension(const TopoDS_Shape& aFShape,
myText = aText;
myPosition = aPosition;
mySymbolPrs = aSymbolPrs;
#ifdef BUC60915
SetArrowSize( anArrowSize );
#else
myArrowSize = anArrowSize;
#endif
myAutomaticPosition = Standard_False;
}
@ -197,9 +190,7 @@ void AIS_Chamf2dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
//determiner la taille de la fleche
//-------------------------------------------------
#ifdef BUC60915
if( !myArrowSizeIsDefined ) {
#endif
Standard_Real arrsize = myArrowSize;
if ( (myVal/4) < arrsize)
arrsize = myVal/4;
@ -207,13 +198,9 @@ void AIS_Chamf2dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
arrsize = 30.;
else if (arrsize < 8.)
arrsize = 8.;
#ifdef BUC60915
myArrowSize = arrsize;
}
arr->SetLength(myArrowSize);
#else
arr->SetLength(arrsize);
#endif
//Calcul de la presentation
DsgPrs_Chamf2dPresentation::Add(aPresentation,

13
src/AIS/AIS_Chamf3dDimension.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60915 //GG 05/06/01 Enable to compute the requested arrow size
// if any in all dimensions.
#include <Standard_NotImplemented.hxx>
#include <AIS_Chamf3dDimension.ixx>
@ -95,11 +92,7 @@ AIS_Chamf3dDimension::AIS_Chamf3dDimension(const TopoDS_Shape& aFShape,
myText = aText;
myPosition = aPosition;
mySymbolPrs = aSymbolPrs;
#ifdef BUC60915
SetArrowSize( anArrowSize );
#else
myArrowSize = anArrowSize;
#endif
myAutomaticPosition = Standard_False;
}
@ -172,9 +165,7 @@ void AIS_Chamf3dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
//Calcul de la boite englobante du component pour
//determiner la taille de la fleche
//-------------------------------------------------
#ifdef BUC60915
if( !myArrowSizeIsDefined ) {
#endif
Standard_Real arrsize = myArrowSize;
if ( (myVal/4) < arrsize)
arrsize = myVal/4;
@ -182,13 +173,9 @@ void AIS_Chamf3dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
arrsize = 30.;
else if (arrsize < 8.)
arrsize = 8.;
#ifdef BUC60915
myArrowSize = arrsize;
}
arr->SetLength(myArrowSize);
#else
arr->SetLength(arrsize);
#endif
//Calcul de la presentation
DsgPrs_Chamf2dPresentation::Add(aPresentation,

3
src/AIS/AIS_Circle.cdl
View File

@ -14,9 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
class Circle from AIS inherits InteractiveObject from AIS
---Purpose: Constructs circle datums to be used in construction of

2
src/AIS/AIS_Circle.cxx
View File

@ -14,8 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
//GER61351 //GG_171199 Enable to set an object RGB color instead a restricted object NameOfColor.
#include <AIS_Circle.ixx>
#include <Aspect_TypeOfLine.hxx>
#include <Prs3d_Drawer.hxx>

5
src/AIS/AIS_EqualRadiusRelation.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60915 //GG 05/06/01 Enable to compute the requested arrow size
// if any in all dimensions.
#include <Standard_NotImplemented.hxx>
#include <AIS_EqualRadiusRelation.ixx>
@ -131,9 +128,7 @@ void AIS_EqualRadiusRelation::Compute( const Handle( PrsMgr_PresentationManager3
}
}
}
#ifdef BUC60915
if( !myArrowSizeIsDefined )
#endif
myArrowSize = (Min(myFirstCenter.Distance(myFirstPoint),
mySecondCenter.Distance(mySecondPoint)))*0.05;

13
src/AIS/AIS_FixRelation.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60915 //GG 05/06/01 Enable to compute the requested arrow size
// if any in all dimensions.
#include <Standard_NotImplemented.hxx>
#include <AIS_FixRelation.ixx>
@ -110,11 +107,7 @@ AIS_FixRelation::AIS_FixRelation(const TopoDS_Shape& aShape,
myFShape = aShape;
myPlane = aPlane;
myPosition = aPosition;
#ifdef BUC60915
SetArrowSize( anArrowSize );
#else
myArrowSize = anArrowSize;
#endif
myAutomaticPosition = Standard_False;
}
@ -147,11 +140,7 @@ AIS_FixRelation::AIS_FixRelation(
myFShape = aShape;
myPlane = aPlane;
myPosition = aPosition;
#ifdef BUC60915
SetArrowSize( anArrowSize );
#else
myArrowSize = anArrowSize;
#endif
myAutomaticPosition = Standard_False;
}
@ -200,9 +189,7 @@ void AIS_FixRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
// calculate presentation
// definition of the symbol size
#ifdef BUC60915
if( !myArrowSizeIsDefined )
#endif
myArrowSize = 5.;
//creation of the presentation

3
src/AIS/AIS_GraphicTool.cdl
View File

@ -14,9 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
class GraphicTool from AIS
---Purpose:

4
src/AIS/AIS_GraphicTool.cxx
View File

@ -14,10 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
//GER61351 //GG_171199 Enable to get an object RGB color instead a restricted object NameOfColor.
#include <AIS_GraphicTool.ixx>

12
src/AIS/AIS_InteractiveContext.cdl
View File

@ -18,20 +18,8 @@
-- rob : Dec 17 1997 -> Update Method Added + Use in Deviation Angle...
-- rob : Feb 05 1998 -> UpdateOnlySelection, UpdateOnlyPrs
-- Apr 02 1998 -> Select Methods has been added a boolean updateviewer.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible i
-- Quantity_Color instead the restricted NameOfColor.
-- Add SetCurrentFacingModel() methods
-- GG : IMP140200 Add SetSelectedAspect() method
-- GG : 25/05/00 BUC60688 Add SetSensitivity() methods
-- VSV : 22/05/01 Add Selection by polygon
-- SAV : Add DisplayFromCollector() method
-- ZSV : IMP160701 Add InitDetected(),MoreDetected(),NextDetected(),
-- DetectedCurrentShape(),DetectedCurrentObject()
-- methods
-- GG : IMP051001 Add SetZDetection() and ZDetection() methods
-- SAV : OCC172 : Delete() redefined to remove selection objects from
-- the static map.
-- SAN : OCC4895 22/03/04 High-level interface for controlling polygon offsets
-- SLN : SetToHilightSelected method added

39
src/AIS/AIS_InteractiveContext_1.cxx
View File

@ -14,17 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define UKI60826 //GG_161199 Use the requested selection color instead of default
#define IMP280200 //GG Don't returns a NULL shape in SelectedShape()
// method when the current selected is a shape !
#define BUC60814 //GG_300101 Idem UKI60826
#define OCC138 //VTN Avoding infinit loop in AddOrRemoveCurrentObject method.
#define OCC9657
#include <AIS_InteractiveContext.jxx>
#include <SelectMgr_EntityOwner.hxx>
#include <AIS_Selection.hxx>
@ -50,10 +39,8 @@
#include <Prs3d_Presentation.hxx>
#ifdef OCC9657
#include <AIS_MapOfInteractive.hxx>
#include <AIS_MapIteratorOfMapOfInteractive.hxx>
#endif
//=======================================================================
//function : MoveTo
@ -531,11 +518,7 @@ void AIS_InteractiveContext::SetCurrentObject(const Handle(AIS_InteractiveObject
Standard_Boolean HasHiCol;
if(IsHilighted(anIObj,HasHiCol,HiCol)){
if(HasHiCol && HiCol!= mySelectionColor) {
#ifdef UKI60826
HilightWithColor(anIObj,mySelectionColor,updateviewer);
#else
Hilight(anIObj,updateviewer);
#endif
}
}
return;
@ -568,19 +551,11 @@ void AIS_InteractiveContext::SetCurrentObject(const Handle(AIS_InteractiveObject
Standard_Boolean HasHiCol;
if(IsHilighted(anIObj,HasHiCol,HiCol)){
if(HasHiCol && HiCol!= mySelectionColor) {
#ifdef UKI60826
HilightWithColor(anIObj,mySelectionColor,Standard_False);
#else
Hilight(anIObj,Standard_False);
#endif
}
}
else{
#ifdef UKI60826
HilightWithColor(anIObj,mySelectionColor,Standard_False);
#else
Hilight(anIObj,Standard_False);
#endif
}
if (updateviewer)
UpdateCurrentViewer();
@ -613,11 +588,7 @@ AddOrRemoveCurrentObject(const Handle(AIS_InteractiveObject)& anIObj,
Standard_Integer mod = (SelStat==AIS_SS_Added) ? 1 : 0;
anIObj->State(mod);
if(mod==1)
#ifdef BUC60814
HilightWithColor(anIObj,mySelectionColor,Standard_False);
#else
Hilight(anIObj,Standard_False);
#endif
else
Unhilight(anIObj,Standard_False);
@ -745,11 +716,7 @@ void AIS_InteractiveContext::HilightCurrents(const Standard_Boolean updateviewer
while (sel->More()) {
TR = sel->Value();
IO = *((Handle(AIS_InteractiveObject)*)&TR);
#ifdef BUC60814
HilightWithColor(IO,mySelectionColor,Standard_False);
#else
Hilight(IO,Standard_False);
#endif
sel->Next();
}
if(updateviewer)
@ -818,11 +785,7 @@ void AIS_InteractiveContext::HilightSelected(const Standard_Boolean updateviewer
while (sel->More()) {
TR = sel->Value();
IO = *((Handle(AIS_InteractiveObject)*)&TR);
#ifdef BUC60814
HilightWithColor(IO,mySelectionColor,Standard_False);
#else
Hilight(IO,Standard_False);
#endif
sel->Next();
}
}
@ -1039,11 +1002,9 @@ void AIS_InteractiveContext::NextSelected()
Standard_Boolean AIS_InteractiveContext::HasSelectedShape() const
{
if(!HasOpenedContext()) {
#ifdef IMP280200
Handle(AIS_Shape) shape =
Handle(AIS_Shape)::DownCast(SelectedInteractive());
if( !shape.IsNull() ) return Standard_True;
#endif
return Standard_False;
}
return myLocalContexts(myCurLocalIndex)->HasSelectedShape();

4
src/AIS/AIS_InteractiveContext_2.cxx
View File

@ -14,8 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define IMP051001 //GG Adds SetZDetected() and ZDetected() methods
#include <AIS_InteractiveContext.jxx>
#include <AIS_LocalContext.hxx>
@ -888,7 +886,6 @@ void AIS_InteractiveContext::ResetOriginalState(const Standard_Boolean updatevie
}
}
#ifdef IMP051001
//=======================================================================
//function : SetZDetection
//purpose :
@ -906,4 +903,3 @@ Standard_Boolean AIS_InteractiveContext::ZDetection() const
{
return myZDetectionFlag;
}
#endif

9
src/AIS/AIS_InteractiveObject.cdl
View File

@ -14,14 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible
-- Quantity_Color instead the restricted NameOfColor.
-- Add SetCurrentFacingModel() methods
-- GG : IMP140100 Add HasPresentation() and Presentation() methods
-- Add SetAspect() method
-- SAN : OCC4895 22/03/04 High-level interface for controlling polygon offsets
deferred class InteractiveObject from AIS inherits SelectableObject from SelectMgr
---Purpose:
@ -607,7 +599,6 @@ fields
myDrawer : Drawer from AIS is protected ;
myTransparency : Real from Standard is protected;
-- GER61351 myOwnColor : NameOfColor from Quantity is protected;
myOwnColor : Color from Quantity is protected;
myOwnMaterial : NameOfMaterial from Graphic3d is protected;
---myOwnMaterial : NameOfPhysicalMaterial from Graphic3d is protected;

75
src/AIS/AIS_InteractiveObject.cxx
View File

@ -16,18 +16,6 @@
// Modified : 22/03/04 ; SAN : OCC4895 High-level interface for controlling polygon offsets
#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.
// Add SetCurrentFacingModel() method
#define BUC60632 //GG 15/03/00 Add protection on SetDisplayMode()
// method, compute only authorized presentation.
#define OCC708 //SAV unsetting transformation correctly
#include <AIS_InteractiveObject.ixx>
#include <Aspect_PolygonOffsetMode.hxx>
@ -76,9 +64,7 @@ mystate(0)
{
Handle (AIS_InteractiveContext) Bid;
myCTXPtr = Bid.operator->();
#ifdef GER61351
SetCurrentFacingModel();
#endif
}
//=======================================================================
@ -208,9 +194,7 @@ void AIS_InteractiveObject::ClearUsers()
//=======================================================================
void AIS_InteractiveObject::SetDisplayMode(const Standard_Integer aMode)
{
#ifdef BUC60632
if( AcceptDisplayMode(aMode) )
#endif
myDisplayMode = aMode;
}
@ -230,7 +214,6 @@ void AIS_InteractiveObject::SetSelectionMode(const Standard_Integer aMode)
//function :
//purpose :
//=======================================================================
#ifdef GER61351
void AIS_InteractiveObject::SetCurrentFacingModel(const Aspect_TypeOfFacingModel aModel) {
myCurrentFacingModel = aModel;
}
@ -243,7 +226,6 @@ void AIS_InteractiveObject::SetCurrentFacingModel(const Aspect_TypeOfFacingModel
Aspect_TypeOfFacingModel AIS_InteractiveObject::CurrentFacingModel() const {
return myCurrentFacingModel;
}
#endif
//=======================================================================
//function : SetColor
@ -251,7 +233,6 @@ Aspect_TypeOfFacingModel AIS_InteractiveObject::CurrentFacingModel() const {
//=======================================================================
void AIS_InteractiveObject::SetColor(const Quantity_NameOfColor aColor)
#ifdef GER61351
{
SetColor(Quantity_Color(aColor));
}
@ -262,7 +243,6 @@ void AIS_InteractiveObject::SetColor(const Quantity_NameOfColor aColor)
//=======================================================================
void AIS_InteractiveObject::SetColor(const Quantity_Color &aColor)
#endif
{
myOwnColor = aColor;
hasOwnColor = Standard_True;
@ -313,9 +293,6 @@ void AIS_InteractiveObject::SetMaterial(const Graphic3d_NameOfMaterial aName)
myDrawer->SetShadingAspect(new Prs3d_ShadingAspect());
myDrawer->ShadingAspect()->SetMaterial(aName);
#ifndef BUC60577 //???
myDrawer->ShadingAspect()->SetColor(AIS_GraphicTool::GetInteriorColor(myDrawer->Link()));
#endif
}
myOwnMaterial = aName;
hasOwnMaterial = Standard_True;
@ -327,11 +304,7 @@ void AIS_InteractiveObject::SetMaterial(const Graphic3d_NameOfMaterial aName)
void AIS_InteractiveObject::SetMaterial(const Graphic3d_MaterialAspect& aMat)
{
#ifdef BUC60577
if( HasColor() || IsTransparent() || HasMaterial() )
#else
if(hasOwnColor ||(myTransparency==0.0) || hasOwnMaterial )
#endif
{
myDrawer->ShadingAspect()->SetMaterial(aMat);
}
@ -349,7 +322,6 @@ void AIS_InteractiveObject::SetMaterial(const Graphic3d_MaterialAspect& aMat)
//=======================================================================
void AIS_InteractiveObject::UnsetMaterial()
{
#ifdef BUC60577
if( !HasMaterial() ) return;
if( HasColor() || IsTransparent()) {
myDrawer->ShadingAspect()->SetMaterial(
@ -357,13 +329,6 @@ void AIS_InteractiveObject::UnsetMaterial()
if( HasColor() ) SetColor(myOwnColor);
if( IsTransparent() ) SetTransparency(myTransparency);
}
#else
if(!hasOwnMaterial) return;
if(hasOwnColor ||(myTransparency==0.0))
{
myDrawer->ShadingAspect()->SetMaterial(AIS_GraphicTool::GetMaterial(myDrawer->Link()));
}
#endif
else{
Handle(Prs3d_ShadingAspect) SA;
myDrawer->SetShadingAspect(SA);
@ -378,7 +343,6 @@ void AIS_InteractiveObject::UnsetMaterial()
void AIS_InteractiveObject::SetTransparency(const Standard_Real aValue)
{
#ifdef BUC60577 // Back & Front material can be different !
if(!HasColor() && !IsTransparent() && !HasMaterial() ) {
myDrawer->SetShadingAspect(new Prs3d_ShadingAspect());
@ -390,34 +354,6 @@ void AIS_InteractiveObject::SetTransparency(const Standard_Real aValue)
FMat.SetTransparency(aValue); BMat.SetTransparency(aValue);
myDrawer->ShadingAspect()->Aspect()->SetFrontMaterial(FMat);
myDrawer->ShadingAspect()->Aspect()->SetBackMaterial(BMat);
#else
if(aValue<0.0 || aValue>1.0) return;
if(aValue<=0.05)
{
UnsetTransparency();
return;
}
if(hasOwnColor || hasOwnMaterial || myTransparency> 0.0)
{
Graphic3d_MaterialAspect Mat = myDrawer->ShadingAspect()->Aspect()->FrontMaterial();
Mat.SetTransparency(aValue);
myDrawer->ShadingAspect()->Aspect()->SetFrontMaterial(Mat);
myDrawer->ShadingAspect()->Aspect()->SetBackMaterial(Mat);
}
else
{
myDrawer->SetShadingAspect(new Prs3d_ShadingAspect());
if(!myDrawer->Link().IsNull())
myDrawer->ShadingAspect()->SetMaterial(AIS_GraphicTool::GetMaterial(myDrawer->Link()));
Graphic3d_MaterialAspect Mat = myDrawer->ShadingAspect()->Aspect()->FrontMaterial();
Mat.SetTransparency(aValue);
myDrawer->ShadingAspect()->Aspect()->SetFrontMaterial(Mat);
myDrawer->ShadingAspect()->Aspect()->SetBackMaterial(Mat);
}
#endif
myTransparency = aValue;
}
@ -427,7 +363,6 @@ void AIS_InteractiveObject::SetTransparency(const Standard_Real aValue)
//=======================================================================
void AIS_InteractiveObject::UnsetTransparency()
{
#ifdef BUC60577 // Back & Front material can be different !
if(HasColor() || HasMaterial() )
{
Graphic3d_MaterialAspect FMat = myDrawer->ShadingAspect()->Aspect()->FrontMaterial();
@ -436,16 +371,6 @@ void AIS_InteractiveObject::UnsetTransparency()
myDrawer->ShadingAspect()->Aspect()->SetFrontMaterial(FMat);
myDrawer->ShadingAspect()->Aspect()->SetBackMaterial(BMat);
}
#else
if(hasOwnColor || hasOwnMaterial )
{
Graphic3d_MaterialAspect Mat = myDrawer->ShadingAspect()->Aspect()->FrontMaterial();
Mat.SetTransparency(0.0);
// myDrawer->ShadingAspect()->Aspect()->SetFrontMaterial(Mat);
// myDrawer->ShadingAspect()->Aspect()->SetBackMaterial(Mat);
myDrawer->ShadingAspect()->SetMaterial(Mat);
}
#endif
else{
Handle (Prs3d_ShadingAspect) SA;
myDrawer->SetShadingAspect(SA);

3
src/AIS/AIS_InteractiveObject.lxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
//GER61351 //GG_171199 Enable to set an object RGB color instead a restricted object NameOfColor.
inline Standard_Boolean AIS_InteractiveObject::AcceptShapeDecomposition() const
{return Standard_False;}

3
src/AIS/AIS_Line.cdl
View File

@ -14,9 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
class Line from AIS inherits InteractiveObject from AIS
---Purpose: Constructs line datums to be used in construction of

2
src/AIS/AIS_Line.cxx
View File

@ -14,8 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
//GER61351 //GG_171199 Enable to set an object RGB color instead a restricted object NameOfColor.
#include <AIS_Line.ixx>
#include <Aspect_TypeOfLine.hxx>
#include <Prs3d_Drawer.hxx>

7
src/AIS/AIS_LocalContext.cdl
View File

@ -21,13 +21,6 @@
-- Modifications in Management of hilight of detected entities
-- VTN 23/11/99 BUC60614 Avoid to crash because
-- myStdFilters array is too short.
-- GG : BUC60688 25/05/00 Add SetSensitivity() methods
-- GG : IMP150501 Remove oboslete method DragTo
-- (See AIS_InteractiveContext)
-- ZSV : IMP160701 Add InitDetected(),MoreDetected(),NextDetected(),
-- DetectedCurrentShape(),DetectedCurrentObject()
-- methods
class LocalContext from AIS inherits TShared from MMgt

41
src/AIS/AIS_LocalContext.cxx
View File

@ -16,20 +16,6 @@
//Modified by ROB : Traque des UpdateConversion intempestifs.
#define BUC60688 //GG 25/05/00 Add SetSensitivity() methods.
#define BUC60722 //GG_040900 Disable detection on an unviewable object
#define IMP160701 //SZV Add InitDetected(),MoreDetected(),NextDetected(),
// DetectedCurrentShape(),DetectedCurrentObject()
// methods
#define ALE70590 //GG Avoid raise especially under W2000-SP2
// when opening many local context due to a
// system error in the selection name computation routine.
// Many thanks to Philippe CARRET for the helpfull he has
// give to accelerate the resolution of this problem.
#include <AIS_LocalContext.ixx>
#include <SelectMgr_OrFilter.hxx>
#include <SelectMgr_CompositionFilter.hxx>
@ -52,35 +38,15 @@
#include <V3d_View.hxx>
#include <Visual3d_View.hxx>
#ifdef ALE70590
#include <stdio.h>
#else
#include <Standard_SStream.hxx>
#endif
static TCollection_AsciiString AIS_Local_SelName(const Standard_Address address,
const Standard_Integer anIndex)
{
// TCollection_AsciiString SelName;
#ifdef ALE70590
char string[100];
sprintf(string,"%p_%d", address, anIndex); // works under any system
TCollection_AsciiString SelName(string);
#else
Standard_SStream stream;
stream<<address; // something is wrong here using the SStream because
// the following access to rdbuf crash for an unknown reason
// especially under W2000 with SP2 and sometime under WNT and W98.
// NOTE that stream is not ended by a NULL char and it's probably
// one of the reasons why this crash.
// In any case the resulting ascii string give a wrong and random
// name under WINDOWS !
TCollection_AsciiString SelName(stream.rdbuf()->str());
// SelName = TCollection_AsciiString("AIS_Local_");
TCollection_AsciiString theind(anIndex);
SelName += "_";
SelName += theind;
#endif
return SelName;
}
@ -109,10 +75,9 @@ myFilters(new SelectMgr_OrFilter()),
myAutoHilight(Standard_True),
mylastindex(0),
mylastgood(0),
myCurDetected(0)
#ifdef IMP160701
,myAISCurDetected(0)
#endif
myCurDetected(0),
myAISCurDetected(0)
{
// bind self to AIS_InteractiveContext::myLocalContexts. Further, the
// constructor executes logic that implies that the context is already

125
src/AIS/AIS_LocalContext_1.cxx
View File

@ -18,58 +18,6 @@
// - use of optimisation in SelectMgr_ViewerSelector
// -> Best management in detected entities...
#define BUC60569 //GG_051199 Enable to select the local context
// in any case and especially in multi selection mode.
// Note that right now when an hilighted owner is selected
// this owner is unhilighted,this permits to see the selection!
// Principle : an owner can have 3 state :
// 1 : The owner is selected and no more highlightable
// 0 : The owner is NOT selected
// -1: The owner is selected but stay highlightable (NEW)
// IMP230600 //GG Add protection on selection methodes
// when nothing is selected
#define BUC60726 //GG_040900 When nothing is detected,
// Clear the last temporary stuff in any case
#define BUC60765 //GG_121000 Avoid to raise when the same selection
// is attached to several local context.
#define BUC60771 //GG_261000 Avoid to crash after closing a view
// containing a selected entity and creating a new one.
#define BUC60774 //GG_261000 Returns right select status on
// bounding-box selection type.
#define BUC60818 //GG_300101 Enable detection even if
// SetAutomaticHilight(FALSE) has been used.
#define IMP300101 //GG Enable to use polygon highlighting
#define BUC60876 //GG_050401 Clear selection always even
// if the current highlight mode is not 0.
#define BUC60953 //SAV_060701 For Select optimization. Selection by rectangle case.
// for single selection no optimization done.
#define IMP120701 //SZV made a shape valid for selection
// when required.
#define IMP160701 //SZV Add InitDetected(),MoreDetected(),NextDetected(),
// DetectedCurrentShape(),DetectedCurrentObject()
// methods
#define OCC138 //VTN Avoding infinit loop in AddOrRemoveSelected method.
#define OCC189 //SAV: 18/03/02 AIS_Selection::Objects() returns ListOfTransient
// instead of array.
#define USE_MAP //san : 18/04/03 USE_MAP - additional datamap is used to speed up access
//to certain owners in AIS_Selection::myresult list
#define OCC9026 //AEL Performance optimization of the FindSelectedOwnerFromShape() method.
#include <AIS_LocalContext.jxx>
#include <StdSelect_BRepOwner.hxx>
#include <TColStd_ListOfInteger.hxx>
@ -88,9 +36,7 @@
#include <TCollection_AsciiString.hxx>
#include <NCollection_Map.hxx>
#ifdef OCC9026
#include <SelectMgr_DataMapIteratorOfDataMapOfIntegerSensitive.hxx>
#endif
#include <SelectMgr_Selection.hxx>
#include <SelectMgr_SequenceOfOwner.hxx>
#include <OSD_Environment.hxx>
@ -98,10 +44,7 @@
#include <Geom_Transformation.hxx>
#include <AIS_Selection.hxx>
#include <Aspect_Grid.hxx>
#ifdef IMP120701
#include <AIS_Shape.hxx>
#endif
static Standard_Integer GetHiMod(const Handle(AIS_InteractiveObject)& IO)
{
@ -397,12 +340,10 @@ AIS_StatusOfPick AIS_LocalContext::ShiftSelect (const Standard_Boolean toUpdateV
}
}
#ifdef BUC60774
Standard_Integer NS = AIS_Selection::Extent();
if( NS == 1 ) return AIS_SOP_OneSelected;
else if( NS > 1 ) return AIS_SOP_SeveralSelected;
return aSelNum == 0 ? AIS_SOP_NothingSelected : AIS_SOP_Removed;
#endif
}
return AIS_SOP_Error;
}
@ -568,9 +509,7 @@ void AIS_LocalContext::Unhilight (const Handle(SelectMgr_EntityOwner)& theOwner,
void AIS_LocalContext::HilightPicked(const Standard_Boolean updateviewer)
{
Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString());
#ifdef BUC60765
if( Sel.IsNull() ) return;
#endif
typedef NCollection_DataMap <Handle(SelectMgr_SelectableObject), NCollection_Handle<SelectMgr_SequenceOfOwner> > SelectMgr_DataMapOfObjectOwners;
SelectMgr_DataMapOfObjectOwners aMap;
@ -578,18 +517,11 @@ void AIS_LocalContext::HilightPicked(const Standard_Boolean updateviewer)
Handle (PrsMgr_PresentationManager3d) PM = myMainPM;
// to avoid problems when there is a loop searching for selected objects...
#if !defined OCC189 && !defined USE_MAP
const TColStd_Array1OfTransient& Obj = Sel->Objects()->Array1();
for(Standard_Integer i =Obj.Lower();i<=Sel->NbStored();i++)
{
const Handle(Standard_Transient)& Tr = Obj(i);
#else
const AIS_NListTransient& Obj = Sel->Objects();
AIS_NListTransient::Iterator anIter( Obj );
for(; anIter.More(); anIter.Next())
{
const Handle(Standard_Transient)& Tr = anIter.Value();
#endif
if(!Tr.IsNull()){
const Handle(SelectMgr_EntityOwner)& Ownr =
*((const Handle(SelectMgr_EntityOwner)*) &Tr);
@ -636,41 +568,26 @@ void AIS_LocalContext::UnhilightPicked (const Standard_Boolean updateviewer)
myMainPM->ClearImmediateDraw();
Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString());
#ifdef BUC60765
if( Sel.IsNull() ) return;
#endif
Handle (PrsMgr_PresentationManager3d) PM = myMainPM;
NCollection_Map<Handle(SelectMgr_SelectableObject)> anObjMap;
#if !defined OCC189 && !defined USE_MAP
const TColStd_Array1OfTransient& Obj = Sel->Objects()->Array1();
for(Standard_Integer i =Obj.Lower();i<=Sel->NbStored();i++){
const Handle(Standard_Transient)& Tr = Obj(i);
#else
const AIS_NListTransient& Obj = Sel->Objects();
AIS_NListTransient::Iterator anIter( Obj );
for(; anIter.More(); anIter.Next()){
const Handle(Standard_Transient)& Tr = anIter.Value();
#endif
if(!Tr.IsNull()){
const Handle(SelectMgr_EntityOwner)& Ownr =
*((const Handle(SelectMgr_EntityOwner)*) &Tr);
Standard_Integer HM(0);
if(Ownr->HasSelectable()){
#ifdef BUC60876
Handle(SelectMgr_SelectableObject) SO = Ownr->Selectable();
Handle(AIS_InteractiveObject) IO = *((Handle(AIS_InteractiveObject)*)&SO);
anObjMap.Add (IO);
HM = GetHiMod(IO);
#endif
Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast(Ownr);
if(BROwnr.IsNull() || !BROwnr->ComesFromDecomposition()){
#ifndef BUC60876
Handle(SelectMgr_SelectableObject) SO = Ownr->Selectable();
Handle(AIS_InteractiveObject) IO = *((Handle(AIS_InteractiveObject)*)&SO);
HM = GetHiMod(IO);
#endif
}
}
Ownr->Unhilight(PM,HM);
@ -903,16 +820,10 @@ void AIS_LocalContext::ClearSelected (const Standard_Boolean updateviewer)
AIS_Selection::SetCurrentSelection(mySelName.ToCString());
Handle(AIS_Selection) Sel = AIS_Selection::CurrentSelection();
#if !defined OCC189 && !defined USE_MAP
const TColStd_Array1OfTransient& Obj = Sel->Objects()->Array1();
for(Standard_Integer i =Obj.Lower();i<=Sel->NbStored();i++){
const Handle(Standard_Transient)& Tr = Obj(i);
#else
const AIS_NListTransient& Obj = Sel->Objects();
AIS_NListTransient::Iterator anIter( Obj );
for(; anIter.More(); anIter.Next()){
const Handle(Standard_Transient)& Tr = anIter.Value();
#endif
if(!Tr.IsNull())
{
(*((const Handle(SelectMgr_EntityOwner)*)&Tr))->SetSelected (Standard_False);
@ -1418,12 +1329,10 @@ Standard_Boolean AIS_LocalContext::IsShape(const Standard_Integer Index) const
Standard_Boolean AIS_LocalContext::IsValidForSelection(const Handle(AIS_InteractiveObject)& anIObj) const
{
#ifdef IMP120701
// Shape was not transfered from AIS_Shape to EntityOwner
Handle(AIS_Shape) shape = Handle(AIS_Shape)::DownCast(anIObj);
if( !shape.IsNull() )
return myFilters->IsOk(new StdSelect_BRepOwner(shape->Shape(),shape));
#endif
return myFilters->IsOk(new SelectMgr_EntityOwner(anIObj));
}
@ -1524,16 +1433,10 @@ Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromIO
return EO;
}
Standard_Boolean found(Standard_False);
#if !defined OCC189 && !defined USE_MAP
const TColStd_Array1OfTransient& Obj = Sel->Objects()->Array1();
for(Standard_Integer i =Obj.Lower();i<=Sel->NbStored();i++){
const Handle(Standard_Transient)& Tr = Obj(i);
#else
const AIS_NListTransient& Obj = Sel->Objects();
AIS_NListTransient::Iterator anIter( Obj );
for(; anIter.More(); anIter.Next()){
const Handle(Standard_Transient)& Tr = anIter.Value();
#endif
if(!Tr.IsNull()){
EO = *((Handle(SelectMgr_EntityOwner)*)&Tr);
if(EO->HasSelectable()){
@ -1557,11 +1460,7 @@ Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromIO
//=======================================================================
Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromShape(const TopoDS_Shape& sh) const
{
#ifdef OCC9026
Handle(SelectMgr_EntityOwner) EO, bid;
#else
Handle(SelectMgr_EntityOwner) EO;
#endif
if (sh.IsNull()) return EO;
Handle(AIS_Selection) Sel = AIS_Selection::Selection(mySelName.ToCString());
@ -1574,7 +1473,6 @@ Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromShape(const
Standard_Boolean found(Standard_False);
#ifdef OCC9026
if (!found) {
SelectMgr_DataMapIteratorOfDataMapOfIntegerSensitive aSensitiveIt (myMainVS->Primitives());
for (; aSensitiveIt.More(); aSensitiveIt.Next()) {
@ -1586,33 +1484,11 @@ Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromShape(const
}
}
}
#else
#if !defined OCC189 && !defined USE_MAP
const TColStd_Array1OfTransient& Obj = Sel->Objects()->Array1();
for(Standard_Integer i =Obj.Lower();i<=Sel->NbStored();i++){
const Handle(Standard_Transient)& Tr = Obj(i);
#else
const AIS_NListTransient& Obj = Sel->Objects();
AIS_NListTransient::Iterator anIter( Obj );
for(; anIter.More(); anIter.Next()){
const Handle(Standard_Transient)& Tr = anIter.Value();
#endif
if(!Tr.IsNull()){
EO = *((Handle(SelectMgr_EntityOwner)*)&Tr);
if(EO->HasShape())
if ( EO->Shape() == sh)
found =Standard_True;
break;
}
}
#endif
if(found) return EO;
return bid;
}
#ifdef IMP160701
//=======================================================================
//function : AIS_LocalContext::InitDetected
//purpose :
@ -1665,4 +1541,3 @@ Handle(AIS_InteractiveObject) AIS_LocalContext::DetectedCurrentObject() const
{
return MoreDetected() ? myAISDetectedSeq(myAISCurDetected) : NULL;
}
#endif

25
src/AIS/AIS_MaxRadiusDimension.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60915 //GG 05/06/01 Enable to compute the requested arrow size
// if any in all dimensions.
#include <Standard_NotImplemented.hxx>
#include <AIS_MaxRadiusDimension.ixx>
@ -97,11 +94,7 @@ AIS_MaxRadiusDimension::AIS_MaxRadiusDimension(const TopoDS_Shape& aShape,
mySymbolPrs = aSymbolPrs;
myPosition = aPosition;
myAutomaticPosition = Standard_False;
#ifdef BUC60915
SetArrowSize( anArrowSize );
#else
myArrowSize = anArrowSize;
#endif
}
//=======================================================================
@ -167,19 +160,10 @@ void AIS_MaxRadiusDimension::ComputeEllipse(const Handle(Prs3d_Presentation)& aP
Handle(Prs3d_ArrowAspect) arr = la->ArrowAspect();
// size
#ifdef BUC60915
if( !myArrowSizeIsDefined ) {
myArrowSize = Min(myArrowSize,myVal / 5.);
}
arr->SetLength(myArrowSize);
#else
if (myVal / 5. > myArrowSize) {
arr->SetLength(myArrowSize);
}
else {
arr->SetLength(myVal / 5.);
}
#endif
Standard_Real U;//,V;
gp_Pnt curPos, Center;
@ -225,19 +209,10 @@ void AIS_MaxRadiusDimension::ComputeArcOfEllipse(const Handle(Prs3d_Presentation
Handle(Prs3d_ArrowAspect) arr = la->ArrowAspect();
// size
#ifdef BUC60915
if( !myArrowSizeIsDefined ) {
myArrowSize = Min(myArrowSize,myVal / 5.);
}
arr->SetLength(myArrowSize);
#else
if (myVal / 5. > myArrowSize) {
arr->SetLength(myArrowSize);
}
else {
arr->SetLength(myVal / 5.);
}
#endif
Standard_Real par;
gp_Pnt curPos, Center;

25
src/AIS/AIS_MinRadiusDimension.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60915 //GG 05/06/01 Enable to compute the requested arrow size
// if any in all dimensions.
#include <Standard_NotImplemented.hxx>
#include <AIS_MinRadiusDimension.ixx>
@ -99,11 +96,7 @@ AIS_MinRadiusDimension::AIS_MinRadiusDimension(const TopoDS_Shape& aShape,
mySymbolPrs = aSymbolPrs;
myPosition = aPosition;
myAutomaticPosition = Standard_False;
#ifdef BUC60915
SetArrowSize( anArrowSize );
#else
myArrowSize = anArrowSize;
#endif
}
//=======================================================================
@ -168,19 +161,10 @@ void AIS_MinRadiusDimension::ComputeEllipse(const Handle(Prs3d_Presentation)& aP
Handle(Prs3d_ArrowAspect) arr = la->ArrowAspect();
// size
#ifdef BUC60915
if( !myArrowSizeIsDefined ) {
myArrowSize = Min(myArrowSize,myVal/5.);
}
arr->SetLength(myArrowSize);
#else
if (myVal/5. > myArrowSize) {
arr->SetLength(myArrowSize);
}
else {
arr->SetLength(myVal/5.);
}
#endif
Standard_Real U;//,V;
gp_Pnt curPos, Center;
@ -227,19 +211,10 @@ void AIS_MinRadiusDimension::ComputeArcOfEllipse(const Handle(Prs3d_Presentation
Handle(Prs3d_ArrowAspect) arr = la->ArrowAspect();
// size
#ifdef BUC60915
if( !myArrowSizeIsDefined ) {
myArrowSize = Min(myArrowSize,myVal/5.);
}
arr->SetLength(myArrowSize);
#else
if (myVal/5. > myArrowSize) {
arr->SetLength(myArrowSize);
}
else {
arr->SetLength(myVal/5.);
}
#endif
Standard_Real par;
gp_Pnt curPos, Center;

11
src/AIS/AIS_ParallelRelation.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60915 //GG 05/06/01 Enable to compute the requested arrow size
// if any in all dimensions.
#include <AIS_ParallelRelation.ixx>
#include <Standard_NotImplemented.hxx>
@ -91,11 +88,7 @@ AIS_ParallelRelation::AIS_ParallelRelation(const TopoDS_Shape& aFShape,
mySShape = aSShape;
myPlane = aPlane;
myAutomaticPosition = Standard_False;
#ifdef BUC60915
SetArrowSize( anArrowSize );
#else
myArrowSize = anArrowSize;
#endif
myPosition = aPosition;
mySymbolPrs = aSymbolPrs;
}
@ -296,17 +289,13 @@ void AIS_ParallelRelation::ComputeTwoEdgesParallel(const Handle(Prs3d_Presentati
myDirAttach = l1.Direction();
// size
#ifdef BUC60915
if( !myArrowSizeIsDefined ) {
#endif
Standard_Real arrSize1 (myArrowSize), arrSize2 (myArrowSize);
if (!isInfinite1) arrSize1 = ptat11.Distance(ptat12)/50.;
if (!isInfinite2) arrSize2 = ptat21.Distance(ptat22)/50.;
myArrowSize = Max(myArrowSize,Max(arrSize1,arrSize2));
// myArrowSize = Min(myArrowSize,Min(arrSize1,arrSize2));
#ifdef BUC60915
}
#endif
if ( myAutomaticPosition )
{

2
src/AIS/AIS_Plane.cdl
View File

@ -14,8 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
--Modified by rob Wed 11 feb 98 : add Size Methods

5
src/AIS/AIS_Plane.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define GER61351 //GG_171199 Enable to set an object RGB color
// instead a restricted object NameOfColor.
#include <AIS_Plane.ixx>
#include <TColgp_Array1OfPnt.hxx>
@ -449,13 +446,11 @@ Standard_Boolean AIS_Plane::Size(Standard_Real& X,Standard_Real& Y) const
void AIS_Plane::SetColor(const Quantity_NameOfColor aCol)
#ifdef GER61351
{
SetColor(Quantity_Color(aCol));
}
void AIS_Plane::SetColor(const Quantity_Color &aCol)
#endif
{
// if the plane already has its proper size, there is an already created planeaspect
// Standard_Boolean yenadeja = hasOwnColor || myHasOwnSize;

7
src/AIS/AIS_PlaneTrihedron.cdl
View File

@ -14,13 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
-- SAV : OCC218 06/03/02 : Added two fields and methods to be able to change
-- axes labels.
-- X/YAxis() returns AIS_Line instead of AIS_Axis
-- (SAMTECH specific)
class PlaneTrihedron from AIS inherits InteractiveObject from AIS
---Purpose: To construct a selectable 2d axis system in a 3d

37
src/AIS/AIS_PlaneTrihedron.cxx
View File

@ -14,18 +14,13 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
//GER61351 //GG_171199 Enable to set an object RGB color instead a restricted object NameOfColor.
#define OCC218 //SAV using DsgPrs_XYZAxisPresentation to draw axes.
// + X/YAxis() returns AIS_Line instead of AIS_Axis
// + (-1) selection mode token into account
// (SAMTECH specific)
#ifdef OCC218
#include <DsgPrs_XYZAxisPresentation.hxx>
#include <AIS_Line.hxx>
#include <Geom_Line.hxx>
#endif
#include <AIS_PlaneTrihedron.ixx>
@ -54,8 +49,6 @@
#include <Select3D_SensitiveFace.hxx>
#define OCC10
void ExtremityPoints(TColgp_Array1OfPnt& PP,const Handle(Geom_Plane)& myPlane,const Handle(Prs3d_Drawer)& myDrawer);
//=======================================================================
@ -79,10 +72,8 @@ AIS_PlaneTrihedron::AIS_PlaneTrihedron(const Handle(Geom_Plane)& aPlane)
myShapes[1] = XAxis();
myShapes[2] = YAxis();
#ifdef OCC218
myXLabel = TCollection_AsciiString( "X" );
myYLabel = TCollection_AsciiString( "Y" );
#endif
}
//=======================================================================
@ -110,7 +101,6 @@ AIS_PlaneTrihedron::AIS_PlaneTrihedron(const Handle(Geom_Plane)& aPlane)
//function : XAxis
//purpose :
//=======================================================================
#ifdef OCC218
Handle(AIS_Line) AIS_PlaneTrihedron::XAxis() const
{
Handle(Geom_Line) aGLine = new Geom_Line(myPlane->Pln().XAxis());
@ -118,21 +108,11 @@ Handle(AIS_Line) AIS_PlaneTrihedron::XAxis() const
aLine->SetColor(Quantity_NOC_ROYALBLUE1);
return aLine;
}
#else
Handle(AIS_Axis) AIS_PlaneTrihedron::XAxis() const
{
Handle(Geom_Axis1Placement) anAx1 = new Geom_Axis1Placement(myPlane->Pln().XAxis());
Handle(AIS_Axis) anAxis = new AIS_Axis (anAx1);
anAxis->SetTypeOfAxis(AIS_TOAX_XAxis);
return anAxis;
}
#endif
//=======================================================================
//function : YAxis
//purpose :
//=======================================================================
#ifdef OCC218
Handle(AIS_Line) AIS_PlaneTrihedron::YAxis() const
{
Handle(Geom_Line) aGLine = new Geom_Line(myPlane->Pln().YAxis());
@ -140,15 +120,6 @@ Handle(AIS_Line) AIS_PlaneTrihedron::YAxis() const
aLine->SetColor(Quantity_NOC_ROYALBLUE1);
return aLine;
}
#else
Handle(AIS_Axis) AIS_PlaneTrihedron::YAxis() const
{
Handle(Geom_Axis1Placement) anAx1 = new Geom_Axis1Placement(myPlane->Pln().YAxis());
Handle(AIS_Axis) anAxis = new AIS_Axis (anAx1);
anAxis->SetTypeOfAxis(AIS_TOAX_YAxis);
return anAxis;
}
#endif
//=======================================================================
//function : Position
@ -162,7 +133,6 @@ Handle(AIS_Point) AIS_PlaneTrihedron::Position() const
return aPt;
}
#ifdef OCC10
void AIS_PlaneTrihedron::SetLength(const Standard_Real theLength) {
myDrawer->DatumAspect()->SetAxisLength(theLength, theLength, theLength);
SetToUpdate();
@ -171,7 +141,6 @@ void AIS_PlaneTrihedron::SetLength(const Standard_Real theLength) {
Standard_Real AIS_PlaneTrihedron::GetLength() const {
return myDrawer->DatumAspect()->FirstAxisLength();
}
#endif
//=======================================================================
//function : Compute
@ -183,9 +152,6 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
{
aPresentation->Clear();
aPresentation->SetDisplayPriority(5);
#ifndef OCC218
DsgPrs_DatumPrs::Add(aPresentation,myPlane->Position().Ax2(),myDrawer);
#else
// drawing axis in X direction
gp_Pnt first, last;
Standard_Real value = myDrawer->DatumAspect()->FirstAxisLength();
@ -208,7 +174,6 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
last.SetCoord( xo + x * value, yo + y * value, zo + z * value );
DsgPrs_XYZAxisPresentation::Add( aPresentation, myDrawer->DatumAspect()->FirstAxisAspect(), myDrawer->ArrowAspect(), myDrawer->TextAspect(), yDir, value, myYLabel.ToCString(), first, last );
#endif
aPresentation->SetInfiniteState (Standard_True);
}
@ -262,14 +227,12 @@ void AIS_PlaneTrihedron::ComputeSelection(const Handle(SelectMgr_Selection)& aSe
}
break;
}
#ifdef OCC218
case -1:
{
Prior = 5;
aSelection->Clear();
break;
}
#endif
}
}

6
src/AIS/AIS_PlaneTrihedron.lxx
View File

@ -14,8 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define OCC218
inline AIS_KindOfInteractive AIS_PlaneTrihedron::Type() const
{return AIS_KOI_Datum;}
@ -26,15 +24,11 @@ inline Standard_Integer AIS_PlaneTrihedron::Signature() const
inline void AIS_PlaneTrihedron::SetXLabel(const TCollection_AsciiString& aLabel)
{
#ifdef OCC218
myXLabel = aLabel;
#endif
}
inline void AIS_PlaneTrihedron::SetYLabel(const TCollection_AsciiString& aLabel)
{
#ifdef OCC218
myYLabel = aLabel;
#endif
}

3
src/AIS/AIS_Point.cdl
View File

@ -14,9 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
class Point from AIS inherits InteractiveObject from AIS
---Purpose: Constructs point datums to be used in construction of

9
src/AIS/AIS_Point.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define GER61351 //GG_171199 Enable to set an object RGB color
// instead a restricted object NameOfColor.
#include <AIS_Point.ixx>
#include <Aspect_TypeOfLine.hxx>
#include <Prs3d_Drawer.hxx>
@ -130,13 +127,11 @@ void AIS_Point::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
//=======================================================================
void AIS_Point::SetColor(const Quantity_NameOfColor aCol)
#ifdef GER61351
{
SetColor(Quantity_Color(aCol));
}
void AIS_Point::SetColor(const Quantity_Color &aCol)
#endif
{
hasOwnColor=Standard_True;
myOwnColor=aCol;
@ -218,11 +213,7 @@ void AIS_Point::UpdatePointValues()
myDrawer->PointAspect().Nullify();
return;
}
#ifdef GER61351
Quantity_Color aCol;
#else
Quantity_NameOfColor aCol;
#endif
Quantity_Color QCO;
Aspect_TypeOfMarker aTOM;
Standard_Real aScale;

5
src/AIS/AIS_Relation.cdl
View File

@ -14,11 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
-- GG : BUC60915 05/06/01 Enable to compute the requested arrow size if any
-- in all dimensions, add a field myArrowSizeIsDefined.
deferred class Relation from AIS inherits InteractiveObject from AIS
---Purpose: One of the four types of interactive object in

13
src/AIS/AIS_Relation.cxx
View File

@ -14,11 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
//GER61351 //GG_171199 Enable to set an object RGB color instead a restricted object NameOfColor.
#define BUC60915 //GG 05/06/01 Enable to compute the requested arrow size
// if any in all dimensions.
#include <AIS.hxx>
#include <Graphic3d_Group.hxx>
@ -60,16 +55,12 @@ AIS_Relation::AIS_Relation(const PrsMgr_TypeOfPresentation3d aTypeOfPresentation
:AIS_InteractiveObject(aTypeOfPresentation3d),
myVal(1.),
myPosition(0.,0.,0.),
#ifdef BUC60915
myArrowSize( myVal / 10. ),
#endif
myAutomaticPosition(Standard_True),
myExtShape(0),
myFirstOffset(0.),mySecondOffset(0.),
myIsSetBndBox( Standard_False )
#ifdef BUC60915
,myArrowSizeIsDefined( Standard_False)
#endif
myIsSetBndBox( Standard_False ),
myArrowSizeIsDefined( Standard_False)
{
}

5
src/AIS/AIS_Relation.lxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60915 //GG 05/06/01 Enable to compute the requested arrow size
// if any in all dimensions.
//=======================================================================
//function : FirstShape
//purpose :
@ -160,9 +157,7 @@ inline Standard_Real AIS_Relation::ArrowSize() const
inline void AIS_Relation::SetArrowSize(const Standard_Real anArrowSize)
{
myArrowSize = anArrowSize;
#ifdef BUC60915
myArrowSizeIsDefined = Standard_True;
#endif
}
//=======================================================================

127
src/AIS/AIS_Selection.cxx
View File

@ -16,35 +16,11 @@
#include <TCollection_AsciiString.hxx>
#include <TColStd_SequenceOfTransient.hxx>
#define BUC60953 // SAV_050701 : the array of selected objects has always the same length
// independently of number of objects selected. Thus, if there were selected
// more than MaxSizeOfResult objects we have got an exception.
// Moreover, Select method was optimized a little bit.
// Now it checks the state of incoming owner. If the state is 0
// there is no searching for object in <myresult> array.
#define OCC138
#define OCC189 //SAV: 18//03/02 array was replaced with list.
#define OCC1039 //SAV: 25/11/02 clearing selected objects if any on the AIS_Selection remove.
#define USE_MAP //san : 18/04/03 USE_MAP - additional datamap is used to speed up access
//to certain owners in <myresult> list
#ifdef BUC60953
#include <SelectMgr_EntityOwner.hxx>
#endif
#ifdef OCC138 //VTN Avoding infinit loop in AddOrRemoveSelected and AddOrRemoveCurrentObject methods.
#include <AIS_InteractiveObject.hxx>
#endif
#ifndef USE_MAP
#define MaxSizeOfResult 10000
#else
#define MaxSizeOfResult 100000
#endif
//current selection (handle)
static Handle(AIS_Selection) theCurrentSelection;
@ -68,14 +44,9 @@ static TColStd_SequenceOfTransient& AIS_Sel_GetSelections()
//=======================================================================
AIS_Selection::AIS_Selection(const Standard_CString aName) :
myName(TCollection_AsciiString(aName)),
#if !defined USE_MAP && !defined OCC189
myresult(new TColStd_HArray1OfTransient(1,MaxSizeOfResult)),
#endif
myNb(0)
{
#ifdef USE_MAP
myResultMap.ReSize( MaxSizeOfResult ); // for maximum performnace on medium selections ( < 100000 objects )
#endif
}
//=======================================================================
@ -150,12 +121,8 @@ void AIS_Selection::Select()
AIS_Sel_CurrentSelection (S);
if(!S.IsNull()){
S->myNb=0;
#if defined OCC189 || defined USE_MAP
S->myresult.Clear();
#ifdef USE_MAP
S->myResultMap.Clear();
#endif
#endif
}
}
@ -181,66 +148,6 @@ AIS_SelectStatus AIS_Selection::Select(const Handle(Standard_Transient)& anObjec
Handle(SelectMgr_EntityOwner) owner = Handle(SelectMgr_EntityOwner)::DownCast( anObject );
if ( owner.IsNull() )
anAISObj = Handle(AIS_InteractiveObject)::DownCast( anObject );
#ifndef OCC189
TColStd_Array1OfTransient& arr = S->myresult->ChangeArray1();
Standard_Integer Found(-1);
Standard_Integer i ;
#ifdef BUC60953
Standard_Boolean selected = Standard_False;
if ( !owner.IsNull() )
selected = owner->State() != 0;
#ifdef OCC138
else if(!anAISObj.IsNull())
selected = anAISObj->State();
}
#endif
if ( selected ) // looking up index of object
#endif
for( i=arr.Lower() && Found==-1;i<=S->myNb;i++){
if(arr(i)==anObject)
Found=i;
}
// If it is not inside, it is added...
#ifdef BUC60953
if ( !selected || Found == -1 ) {
#else
if(Found==-1){
#endif
if((S->myNb)+1>arr.Length()){
Handle(TColStd_HArray1OfTransient) NiouTab = new TColStd_HArray1OfTransient(1,arr.Length()+MaxSizeOfResult);
for(i=arr.Lower();i<=S->myNb;i++){
const Handle(Standard_Transient)& T = S->myresult->Value(i);
NiouTab->SetValue(i,T);
}
#ifdef BUC60953
S->myresult = NiouTab;
#endif
}
(S->myNb)++;
S->myresult->SetValue(S->myNb,anObject);
return AIS_SS_Added;
}
// it was inside and it is removed...
for(i=Found;i<=S->myNb;i++)
arr(i)=arr(i+1);
S->myNb--;
#elif !defined USE_MAP //OCC189
AIS_NListTransient::Iterator anIter ( S->myresult );
for ( ; anIter.More(); anIter.Next() )
if ( anIter.Value() == anObject ) {
S->myresult.Remove( anIter );
return AIS_SS_Removed;
}
S->myresult.Append( anObject );
return AIS_SS_Added;
#else //USE_MAP
if ( S->myResultMap.IsBound( anObject ) ){
AIS_NListTransient::Iterator aListIter = S->myResultMap.Find( anObject );
//skt-----------------------------------------------------------------
@ -251,14 +158,12 @@ AIS_SelectStatus AIS_Selection::Select(const Handle(Standard_Transient)& anObjec
S->myIterator = AIS_NListTransient::Iterator();
}
//--------------------------------------------------------------------
#ifdef BUC60953
// In the mode of advanced mesh selection only one owner is created
// for all selection modes. It is necessary to check the current detected
// entity and remove the owner from map only if the detected entity is
// the same as previous selected (IsForcedHilight call)
if( !anAISObj.IsNull() || ( !owner.IsNull() && !owner->IsForcedHilight() ) )
{
#endif
S->myresult.Remove( aListIter );
S->myResultMap.UnBind( anObject );
@ -280,7 +185,6 @@ AIS_SelectStatus AIS_Selection::Select(const Handle(Standard_Transient)& anObjec
S->myresult.Append( anObject, aListIter );
S->myResultMap.Bind( anObject, aListIter );
return AIS_SS_Added;
#endif //USE_MAP
}
//=======================================================================
@ -293,29 +197,12 @@ AIS_SelectStatus AIS_Selection::AddSelect(const Handle(Standard_Transient)& anOb
AIS_Sel_CurrentSelection (S);
if(S.IsNull()) return AIS_SS_NotDone;
#ifndef OCC189
TColStd_Array1OfTransient& arr = S->myresult->ChangeArray1();
Standard_Integer i;
if((S->myNb)+1>arr.Length()){
Handle(TColStd_HArray1OfTransient) NiouTab = new TColStd_HArray1OfTransient(1,arr.Length()+MaxSizeOfResult);
for(i=arr.Lower();i<=S->myNb;i++){
const Handle(Standard_Transient)& T = S->myresult->Value(i);
NiouTab->SetValue(i,T);
}
S->myresult = NiouTab;
}
(S->myNb)++;
S->myresult->SetValue(S->myNb,anObject);
#elif !defined USE_MAP //OCC189
S->myresult.Append( anObject );
#else //USE_MAP
if ( S->myResultMap.IsBound( anObject ) )
return AIS_SS_NotDone;
AIS_NListTransient::Iterator aListIter;
S->myresult.Append( anObject, aListIter );
S->myResultMap.Bind( anObject, aListIter );
#endif
return AIS_SS_Added;
}
@ -343,11 +230,7 @@ void AIS_Selection::ClearAndSelect(const Handle(Standard_Transient)& anObject) {
Standard_Integer AIS_Selection::Extent() {
Handle(AIS_Selection) S;
AIS_Sel_CurrentSelection (S);
#if !defined OCC189 && !defined USE_MAP
return S->myNb;
#else
return S->myresult.Extent();
#endif
}
//=======================================================================
@ -371,15 +254,7 @@ Standard_Boolean AIS_Selection::IsSelected(const Handle(Standard_Transient)& anO
Handle(AIS_Selection) S;
AIS_Sel_CurrentSelection (S);
if(S.IsNull()) return Standard_False;
#ifndef USE_MAP
for(S->Init();S->More();S->Next()){
if(S->Value()==anObject)
return Standard_True;
}
return Standard_False;
#else
return S->myResultMap.IsBound( anObject );
#endif
}
//=======================================================================
@ -407,12 +282,10 @@ void AIS_Selection::Remove(const Standard_CString aName)
{
Standard_Integer I = AIS_Selection::Index(aName);
if(I!=0) {
#ifdef OCC1039
Handle(AIS_Selection) selection = Handle(AIS_Selection)::DownCast( AIS_Sel_GetSelections().Value(I) );
Standard_Integer stored = selection->NbStored();
if ( stored )
selection->Select();
#endif
AIS_Sel_GetSelections().Remove(I);
}
}

9
src/AIS/AIS_Shape.cdl
View File

@ -14,15 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
-- Redefines the Color(),Material(),Transparency() methods
-- for taking in acount the current facing model.
-- GG : BUC60536 The compute methods must be defined "protected"
-- and no more "private"
class Shape from AIS inherits InteractiveObject from AIS
---Purpose: A framework to manage presentation and selection of shapes.

7
src/AIS/AIS_SymmetricRelation.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60915 //GG 05/06/01 Enable to compute the requested arrow size
// if any in all dimensions.
#include <Standard_NotImplemented.hxx>
#include <AIS_SymmetricRelation.ixx>
@ -498,9 +495,7 @@ void AIS_SymmetricRelation::ComputeTwoEdgesSymmetric(const Handle(Prs3d_Presenta
mySAttach = ElCLib::Value(ElCLib::Parameter(line2,myFAttach),line2);
}
#ifdef BUC60915
if( !myArrowSizeIsDefined )
#endif
myArrowSize = myFAttach.Distance(mySAttach)/50.;
//----------------------------------------------------
@ -599,9 +594,7 @@ void AIS_SymmetricRelation::ComputeTwoVerticesSymmetric(const Handle(Prs3d_Prese
AIS::ComputeGeometry(TopoDS::Vertex(myFShape), myFAttach, myPlane, isOnPlane1);
AIS::ComputeGeometry(TopoDS::Vertex(mySShape), mySAttach, myPlane, isOnPlane2);
#ifdef BUC60915
if( !myArrowSizeIsDefined )
#endif
myArrowSize = myFAttach.Distance(mySAttach)/50.;
if (isOnPlane1 && isOnPlane2)

5
src/AIS/AIS_Trihedron.cdl
View File

@ -15,11 +15,6 @@
-- commercial license or contractual agreement.
-- Modified by: rob Wed Feb 11 -> Size of Trihedron
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
-- GG : IMP120100 Add SetTextColor() methods.
-- SetArrowColor() methods.
class Trihedron from AIS inherits InteractiveObject from AIS

16
src/AIS/AIS_Trihedron.cxx
View File

@ -14,10 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
//GER61351 //GG_171199 Enable to set an object RGB color instead a restricted object NameOfColor.
#define IMP120100 // GG Add SetTextColor() and SetArrowColor() methods
#include <AIS_Trihedron.ixx>
#include <DsgPrs_DatumPrs.hxx>
#include <SelectBasics_EntityOwner.hxx>
@ -63,11 +59,9 @@
//=======================================================================
AIS_Trihedron::AIS_Trihedron(const Handle(Geom_Axis2Placement)& aComponent):
myComponent(aComponent),
myHasOwnSize(Standard_False)
#ifdef IMP120100
,myHasOwnTextColor(Standard_False)
,myHasOwnArrowColor(Standard_False)
#endif
myHasOwnSize(Standard_False),
myHasOwnTextColor(Standard_False),
myHasOwnArrowColor(Standard_False)
{ LoadSubObjects();}
@ -452,7 +446,6 @@ void AIS_Trihedron::SetColor(const Quantity_Color &aCol)
//purpose :
//=======================================================================
#ifdef IMP120100
void AIS_Trihedron::SetTextColor(const Quantity_NameOfColor aCol)
{
myHasOwnTextColor = Standard_True;
@ -512,7 +505,6 @@ Quantity_NameOfColor AIS_Trihedron::ArrowColor() const {
return myOwnArrowColor;
}
#endif
//=======================================================================
@ -588,7 +580,6 @@ void AIS_Trihedron::UnsetColor()
myDrawer->DatumAspect()->FirstAxisAspect()->SetColor(myOwnColor);
myDrawer->DatumAspect()->SecondAxisAspect()->SetColor(myOwnColor);
myDrawer->DatumAspect()->ThirdAxisAspect()->SetColor(myOwnColor);
#ifdef IMP120100
if( HasTextColor() ) {
SetTextColor(myOwnColor.Name());
myHasOwnTextColor = Standard_False;
@ -597,7 +588,6 @@ void AIS_Trihedron::UnsetColor()
SetArrowColor(myOwnColor.Name());
myHasOwnArrowColor = Standard_False;
}
#endif
}

8
src/Aspect/Aspect_AspectFillArea.cxx
View File

@ -52,8 +52,6 @@
// MyHatchStyle : HatchStyle;
#define OCC1174 // SAV : 08/01/03 Added back face interior color
//-Constructors
//-Destructors
@ -64,9 +62,7 @@ Aspect_AspectFillArea::Aspect_AspectFillArea () {
MyInteriorStyle = Aspect_IS_EMPTY;
MyInteriorColor = Quantity_NOC_CYAN1;
#ifdef OCC1174
MyBackInteriorColor = Quantity_NOC_CYAN1;
#endif
MyEdgeColor = Quantity_NOC_WHITE;
MyEdgeType = Aspect_TOL_SOLID;
MyEdgeWidth = 1.0;
@ -103,9 +99,7 @@ void Aspect_AspectFillArea::SetInteriorColor (const Quantity_Color& AColor) {
void Aspect_AspectFillArea::SetBackInteriorColor( const Quantity_Color& color )
{
#ifdef OCC1174
MyBackInteriorColor = color;
#endif
}
void Aspect_AspectFillArea::SetEdgeColor (const Quantity_Color& AColor) {
@ -156,9 +150,7 @@ void Aspect_AspectFillArea::Values (Aspect_InteriorStyle& AStyle, Quantity_Color
AStyle = MyInteriorStyle;
AIntColor = MyInteriorColor;
#ifdef OCC1174
BackIntColor = MyBackInteriorColor;
#endif
AEdgeColor = MyEdgeColor;
AType = MyEdgeType;
AWidth = MyEdgeWidth;

28
src/Aspect/Aspect_CircularGrid.cxx
View File

@ -13,14 +13,6 @@
// Modified 23/02/98 : FMN ; Remplacement PI par Standard_PI
#define CSR577 //GG 25/09/00 Avoid to have unaccuracy coordinates computation
// when the grid is activated.
#define OCC192_193 // jfa 27/02/2002
// for big rotation angles - error of negative values expression in round numbers
#define xTRACE
#include <Aspect_CircularGrid.ixx>
#include <Aspect_Grid.hxx>
#include <Standard_NumericError.hxx>
@ -71,11 +63,6 @@ void Aspect_CircularGrid::Compute(const Quantity_Length X,
Quantity_Length& gridX,
Quantity_Length& gridY) const {
#ifdef TRACE
if( X == 0. || Y == 0. ) {
cout << " Aspect_CircularGrid" << endl;
}
#endif
Standard_Real xo = XOrigin();
Standard_Real yo = YOrigin();
Standard_Real d = Sqrt( (xo-X)*(xo-X) + (yo-Y)*(yo-Y) );
@ -85,13 +72,8 @@ void Aspect_CircularGrid::Compute(const Quantity_Length X,
Standard_Real a = ACos(cosinus);
Standard_Real ra = RotationAngle();
if ( Y < yo ) a = 2 * M_PI - a;
#ifdef OCC192_193
n = (Standard_Integer ) ((a-ra)/myAlpha + Sign(0.5, a-ra)) ;
#else
n = (Standard_Integer ) ((a-ra)/myAlpha +0.5 ) ;
#endif
#ifdef CSR577
Standard_Real cs=0,sn=0;
Standard_Boolean done = Standard_False;
Standard_Integer nmax = 2*myDivisionNumber;
@ -139,18 +121,8 @@ void Aspect_CircularGrid::Compute(const Quantity_Length X,
Standard_Real ang = ra + Standard_Real(n)*myAlpha;
cs = Cos(ang); sn = Sin(ang);
}
#else
Standard_Real ang = RotationAngle()+ Standard_Real(n)*myAlpha;
Standard_Real cs = Cos(ang);
Standard_Real sn = Sin(ang);
#endif
gridX = xo + cs * radius;
gridY = yo + sn * radius;
#ifdef TRACE
cout << "Aspect_CircularGrid::Compute (" << Quantity_Length (X) << ", "
<< Quantity_Length (Y) << ", " << Quantity_Length (gridX) << ", "
<< Quantity_Length (gridY) << ")" << endl;
#endif
}
Quantity_Length Aspect_CircularGrid::RadiusStep() const {

3
src/Aspect/Aspect_Grid.cdl
View File

@ -14,9 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- Updated: GG IMP230300 Add grid color parameters in constructor
-- and add new methods SetColors() & Colors()
deferred class Grid from Aspect
inherits TShared from MMgt

3
src/Aspect/Aspect_Grid.cxx
View File

@ -11,9 +11,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
// Updated: GG IMP230300 Add grid color parameters in constructor
// and add new methods SetColors() & Colors()
#include <Aspect_Grid.ixx>

26
src/Aspect/Aspect_RectangularGrid.cxx
View File

@ -13,11 +13,6 @@
// Modified 23/02/98 : FMN ; Remplacement PI par Standard_PI
#define CSR577 //GG 25/09/00 Avoid to have unaccuracy coordinates computation
// when the grid is activated.
#define xTRACE
#include <Aspect_RectangularGrid.ixx>
@ -100,20 +95,9 @@ void Aspect_RectangularGrid::Compute(const Quantity_Length X,
Standard_Integer n2 = Standard_Integer ( Abs(D2)/myYStep + 0.5);
Standard_Real offset1 = c1 + Standard_Real(n1) * Sign (myXStep , D1);
Standard_Real offset2 = c2 + Standard_Real(n2) * Sign (myYStep , D2);
#ifdef CSR577
Standard_Real Delta = a1*b2 - b1*a2;
gridX = ( offset2*a1 - offset1*a2) /Delta;
gridY = ( offset2*b1 - offset1*b2) /Delta;
#else
Standard_Real Delta = b1*a2 - a1*b2;
gridX = ( offset1*a2 - offset2*a1) /Delta;
gridY = ( offset1*b2 - offset2*b1) /Delta;
#endif
#ifdef TRACE
cout << "Aspect_RectangularGrid::Compute (" << Quantity_Length (X) << ", "
<< Quantity_Length (Y) << ", " << Quantity_Length (gridX) << ", "
<< Quantity_Length (gridY) << ")" << endl;
#endif
}
Quantity_Length Aspect_RectangularGrid::XStep() const {
@ -143,7 +127,6 @@ void Aspect_RectangularGrid::Init () {
// b2 = Sin (mySecondAngle + RotationAngle() + M_PI / 2.);
// c2 = XOrigin() * b2 - YOrigin() * a2;
#ifdef CSR577
Standard_Real angle1 = myFirstAngle + RotationAngle();
Standard_Real angle2 = mySecondAngle + RotationAngle();
if ( angle1 != 0. ) {
@ -162,15 +145,6 @@ void Aspect_RectangularGrid::Init () {
} else {
a2 = -1.; b2 = 0.; c2 = YOrigin();
}
#else
a1 = -Sin (myFirstAngle + RotationAngle());
b1 = Cos (myFirstAngle + RotationAngle());
c1 = XOrigin() * b1 - YOrigin() * a1;
a2 = -Sin (mySecondAngle + RotationAngle() + M_PI / 2.);
b2 = Cos (mySecondAngle + RotationAngle() + M_PI / 2.);
c2 = XOrigin() * b2 - YOrigin() * a2;
#endif
//-zov
}

30
src/ChFi2d/ChFi2d_Builder.cxx
View File

@ -14,36 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
// Modified: Tue Oct 15 10:12:02 1996
// correction in BuildFilletEdge (PRO3529 : computation of dist)
// Modified: Tue Oct 22 09:23:11 1996
// correction in BuildFilletEdge (PRO5827 : computation of vec1)
// Modified: Tue Oct 22 09:23:11 1996
// new status in ComputeFillet for degenerated edges (PRO4896)
// Modified: Thu Dec 5 16:25:44 1996
// correction in BuildFilletEdge (PRO4896 : NewExtr1, NewExtr2)
// Modified: Tue Apr 22 16:25:44 1996
// correction in BuildFilletEdge (ID140047 : inside)
// Modified: Fri Oct 24 10:47:52 1997
// distinction point de tangence --> on arrete
// point de rebroussement --> on continue
// (PRO10404 : Ve3, Ve4)
// Modified: Tue Oct 28 11:55:53 1997
// construction de filletEdge avec les parametres U1 et Vv1
// au lieu des vertex (PRO10434)
// Modified: Tue Apr 7 14:35:58 1998
// construction de filletEdge avec les parametres U1 et Vv1
// ET les vertex NewExtr1, NewExtr2 sinon pb sur qq aretes
// degenerees (GER60069 + controle de PRO10434)
// Modified: Mon Jun 22 13:32:25 1998
// verification de la validite des parametres (PRO13078 partiel)
// Modified: Fri Sep 25 09:38:04 1998
// status = ChFi2d_NotAuthorized si les aretes ne sont pas
// des droites ou des cercles; fonction IsLineOrCircle
// (BUC60288)
#include <ChFi2d.hxx>
#include <ChFi2d_Builder.ixx>

10
src/DBC/DBC_VArray.gxx
View File

@ -17,8 +17,6 @@
#include <Standard_NullObject.hxx>
#include <Standard_NotImplemented.hxx>
#define BUGOCC425
#ifdef OBJS
#include <Standard_Persistent.hxx>
@ -48,9 +46,7 @@ DBC_VArray::DBC_VArray() : DBC_BaseArray()
DBC_VArray::DBC_VArray(const Standard_Integer Size) : DBC_BaseArray(Size)
{
#ifdef BUGOCC425
if(Size > 0) {
#endif
#ifdef CSFDB
myData = (DBC_VArrayTNode*)Standard::Allocate(Size * sizeof(DBC_VArrayTNode));
DBC_VArrayTNode* ptrtmp = (DBC_VArrayTNode*)myData;
@ -66,7 +62,6 @@ DBC_VArray::DBC_VArray(const Standard_Integer Size) : DBC_BaseArray(Size)
myData = new (os_segment::of(this),DBC_VArrayNode::get_os_typespec(),Size) DBC_VArrayNode[Size];
#endif
#ifdef BUGOCC425
} else {
#ifdef CSFDB
myData = 0L;
@ -75,7 +70,6 @@ DBC_VArray::DBC_VArray(const Standard_Integer Size) : DBC_BaseArray(Size)
myData = NULL;
#endif
}
#endif
}
DBC_VArray::DBC_VArray(const DBC_VArray& Varray) : DBC_BaseArray(Varray)
@ -281,11 +275,7 @@ void DBC_VArray::SetValue(const Standard_Integer Index, const Item& Value)
void DBC_VArray::Destroy()
{
#ifdef CSFDB
#ifdef BUGOCC425
if (myData && mySize > 0) {
#else
if (myData) {
#endif
DBC_VArrayTNode* ptrtmp = (DBC_VArrayTNode*)myData;
for(Standard_Integer i = 0; i < mySize; i++) {
ptrtmp->DBC_VArrayTNode::~DBC_VArrayTNode();

25
src/FSD/FSD_CmpFile.cxx
View File

@ -19,20 +19,6 @@
#include <Storage_StreamUnknownTypeError.hxx>
#include <Standard_PCharacter.hxx>
// Propagate the improvement (BUC60808) on all platforms
// #ifdef WNT
#define BUC60808
// BUC60808 : standard output in MS Visual C++ limites the quantity of figures (digits)
// in part of number after fixed point. The quantity of figures after fixed point
// could not be more than 15 when we output double number using standard MS VS output operator '<<'.
// For example, the maximum double value DBL_MAX = 1.7976931348623157e+308 (see float.h) after
// cout<<setprecision(17)<<DBL_MAX becomes 1.79769313486232e+308 in stream of output
// (it could be a file stream). When the number 1.79769313486232e+308 is read from the
// i/o streame (file, for example) it occurs more than allowed maximum value of double
// type - 1.7976931348623157e+308. Such value is considered as infinite. When it is written
// to file (for example) again it is written as 1.#INF. Such value can't be read from file next time.
//#endif
const Standard_CString MAGICNUMBER = "CMPFILE";
//=======================================================================
@ -582,7 +568,6 @@ Storage_BaseDriver& FSD_CmpFile::GetBoolean(Standard_Boolean& aValue)
Storage_BaseDriver& FSD_CmpFile::GetReal(Standard_Real& aValue)
{
#ifdef BUC60808
char realbuffer[100];
realbuffer[0] = '\0';
@ -602,11 +587,6 @@ Storage_BaseDriver& FSD_CmpFile::GetReal(Standard_Real& aValue)
}
return *this;
#else
if (!(myStream >> aValue)) Storage_StreamTypeMismatchError::Raise();
return *this;
#endif
}
//=======================================================================
@ -616,7 +596,6 @@ Storage_BaseDriver& FSD_CmpFile::GetReal(Standard_Real& aValue)
Storage_BaseDriver& FSD_CmpFile::GetShortReal(Standard_ShortReal& aValue)
{
#ifdef BUC60808
char realbuffer[100];
Standard_Real r = 0.0;
@ -628,10 +607,6 @@ Storage_BaseDriver& FSD_CmpFile::GetShortReal(Standard_ShortReal& aValue)
aValue = (Standard_ShortReal)r;
return *this;
#else
if (!(myStream >> aValue)) Storage_StreamTypeMismatchError::Raise();
return *this;
#endif
}
//=======================================================================

1
src/GeomFill/GeomFill_SweepSectionGenerator.cxx
View File

@ -42,7 +42,6 @@ static Standard_Boolean Affich = Standard_False;
static Standard_Integer NbSECTIONS = 0;
#endif
//#define GF_DEB
//=======================================================================
//function : GeomFill_SweepSectionGenerator
//purpose :

1
src/Graphic3d/Graphic3d.cdl
View File

@ -35,7 +35,6 @@
-- and derivated used for model presentation.
-- Required: enumeration TypeOfPrimitive;
-- imported PrimitiveArray; class PrimitiveList.
-- 17-12-01 : GG ; IMP171201 : Add material name UserDefined
-- Thanks to Stephane ROUTELOUS
-- 20-01-2009 : ABD Integration support of system fonts (using FTGL and FreeType)
-- Objective : Specifications definitives

7
src/Graphic3d/Graphic3d_DataStructureManager.cxx
View File

@ -13,9 +13,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define XTRACE
#define XDESTROY
// 11/97 ; CAL : retrait des DataStructure
@ -47,8 +44,4 @@ Graphic3d_DataStructureManager::Graphic3d_DataStructureManager () {
void Graphic3d_DataStructureManager::Destroy () {
#ifdef DESTROY
cout << "Graphic3d_DataStructureManager::Destroy ()\n";
#endif
}

5
src/Graphic3d/Graphic3d_MaterialAspect.cdl
View File

@ -18,11 +18,6 @@
-- 26-03-99 : FMN ; Compatibilite ascendante: Ajout methodes SetColor() et Color()
-- 09-04-99 : GG ; Compatibilite ascendante:
-- NameOfPhysicalMaterial disparait.
-- 23-11-99 : GG : GER61351 Add Name() & Reset() methods
-- IMP150200: GG : Add IsEqual() IsDifferent() methods.
-- Add NumberOfMaterials() MaterialName() class methods
-- IMP171201: GG : Add MaterialName(), SetMaterialName()
-- instance methods and field MyRequestedMaterialName
class MaterialAspect from Graphic3d

18
src/Graphic3d/Graphic3d_StructureManager.cxx
View File

@ -13,10 +13,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define XTRACE
//-Version
//-Design Declaration of variables specific to managers
@ -97,11 +93,6 @@ Standard_Integer Limit = Graphic3d_StructureManager::Limit ();
void Graphic3d_StructureManager::Destroy () {
#ifdef TRACE
cout << "Graphic3d_StructureManager::Destroy (" << MyId << ")\n";
cout << flush;
#endif
MyDisplayedStructure.Clear ();
MyHighlightedStructure.Clear ();
StructureManager_ArrayId[MyId] = 0;
@ -181,10 +172,6 @@ Handle(Graphic3d_AspectFillArea3d) Graphic3d_StructureManager::FillArea3dAspect
void Graphic3d_StructureManager::Remove (const Standard_Integer AnId) {
#ifdef TRACE
cout << "Graphic3d_StructureManager::Remove " << AnId << "\n" << flush;
#endif
MyStructGenId.Free (AnId);
}
@ -224,11 +211,6 @@ Standard_Integer Graphic3d_StructureManager::NewIdentification () {
Standard_Integer Id = MyStructGenId.Next ();
#ifdef TRACE
cout << "Graphic3d_StructureManager::NewIdentification " << Id << "\n";
cout << flush;
#endif
return Id;
}

4
src/HLRBRep/HLRBRep_Data.cxx
View File

@ -16,8 +16,6 @@
//#define No_Standard_OutOfRange
#define OCC191 // jfa 26/02/2002 Bug of cone display
#include <HLRBRep_Data.ixx>
#include <StdFail_UndefinedDerivative.hxx>
@ -830,9 +828,7 @@ void HLRBRep_Data::Update (const HLRAlgo_Projector& P)
mySLProps.SetParameters(pu,pv);
gp_Pnt Pt;
Pt = EC.Value3D(p);
#ifdef OCC191
if (mySLProps.IsNormalDefined())
#endif
{
gp_Vec Nm = mySLProps.Normal();
Pt.Transform(T);

3
src/IFGraph/IFGraph_SCRoots.cxx
View File

@ -17,9 +17,6 @@
#include <IFGraph_ExternalSources.hxx>
#include <Standard_Transient.hxx>
//#define PRINTDEB
IFGraph_SCRoots::IFGraph_SCRoots
(const Interface_Graph& agraph, const Standard_Boolean whole)
: IFGraph_StrongComponants (agraph,whole) { }

29
src/IFGraph/IFGraph_StrongComponants.cxx
View File

@ -16,10 +16,6 @@
#include <Interface_Graph.hxx>
#include <Interface_GraphContent.hxx>
//#define PRINTDEB
#define pbgraphtool
IFGraph_StrongComponants::IFGraph_StrongComponants
(const Interface_Graph& agraph, const Standard_Boolean whole)
: IFGraph_SubPartsIterator (agraph, whole) { }
@ -28,35 +24,10 @@ IFGraph_StrongComponants::IFGraph_StrongComponants
{
Interface_GraphContent iter = Loaded();
Interface_Graph G(thegraph); G.GetFromIter(iter,0);
#ifdef pbgraphtool
Standard_Integer nb = G.Size();
for (Standard_Integer i = 1; i <= nb; i ++) {
if (!G.IsPresent(i)) continue;
AddPart();
GetFromEntity (G.Entity(i),Standard_False);
}
#else
#ifdef OCCT_DEBUG
cout<<"StrongComponants :"<<endl;
#endif
for (IFGraph_SortedStrongs res(G); res.More(); res.Next()) {
Standard_Integer nb = res.NbVertices();
#ifdef OCCT_DEBUG
cout<<" Iteration, Vertices:"<<nb<<" :";
#endif
if (nb == 0) continue;
AddPart();
for (Standard_Integer i = 1; i <= nb; i ++)
#ifdef OCCT_DEBUG
{
Handle(Standard_Transient) oneres = res.Value(i);
cout<<" "<<G.EntityNumber(oneres);
GetFromEntity(oneres,Standard_False);
}
cout<<endl;
#else
GetFromEntity(res.Value(i),Standard_False);
#endif
}
#endif
}

6
src/MDataStd/MDataStd_NameRetrievalDriver.cxx
View File

@ -38,19 +38,13 @@ Handle(TDF_Attribute) MDataStd_NameRetrievalDriver::NewEmpty() const
#include <TDF_Tool.hxx>
#include <TDF_Label.hxx>
#define BUGOCC425
void MDataStd_NameRetrievalDriver::Paste(const Handle(PDF_Attribute)& Source,const Handle(TDF_Attribute)& Target,const Handle(MDF_RRelocationTable)& ) const
{
Handle(PDataStd_Name) S = Handle(PDataStd_Name)::DownCast (Source);
Handle(TDataStd_Name) T = Handle(TDataStd_Name)::DownCast (Target);
#ifdef BUGOCC425
if(!S->Get().IsNull()) {
#endif
TCollection_ExtendedString Name = (S->Get())->Convert ();
T->Set (Name);
#ifdef BUGOCC425
}
#endif
}

6
src/MDataStd/MDataStd_NameStorageDriver.cxx
View File

@ -19,8 +19,6 @@
#include <PCollection_HExtendedString.hxx>
#include <CDM_MessageDriver.hxx>
#define BUGOCC425
MDataStd_NameStorageDriver::MDataStd_NameStorageDriver(const Handle(CDM_MessageDriver)& theMsgDriver):MDF_ASDriver(theMsgDriver)
{
}
@ -38,13 +36,9 @@ void MDataStd_NameStorageDriver::Paste(const Handle(TDF_Attribute)& Source,const
{
Handle(TDataStd_Name) S = Handle(TDataStd_Name)::DownCast (Source);
Handle(PDataStd_Name) T = Handle(PDataStd_Name)::DownCast (Target);
#ifdef BUGOCC425
if(S->Get().Length() != 0) {
#endif
Handle(PCollection_HExtendedString) Name = new PCollection_HExtendedString (S->Get());
T->Set (Name);
#ifdef BUGOCC425
}
#endif
}

55
src/MgtBRep/MgtBRep_TranslateTool.cxx
View File

@ -72,7 +72,6 @@
// szy 23.01.2014 (bug 24565) correction for edge which has null 3d curve representation
// Used for testing DownCast time
#define MgtBRepSpeedDownCast
#ifdef chrono
#include <OSD_Timer.hxx>
@ -97,12 +96,8 @@ Handle(PGeom_Curve) MgtBRep_TranslateTool::Translate
Handle(PGeom_Curve) PP;
if (!TP.IsNull()) {
if (aMap.IsBound(TP)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Persistent) aPers = aMap.Find(TP);
PP = (Handle(PGeom_Curve)&) aPers;
#else
PP = Handle(PGeom_Curve)::DownCast(aMap.Find(TP));
#endif
}
else {
PP = MgtGeom::Translate(TP);
@ -127,12 +122,8 @@ Handle(Geom_Curve) MgtBRep_TranslateTool::Translate
Handle(Geom_Curve) TP;
if (!PP.IsNull()) {
if (aMap.IsBound(PP)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Transient) aTrans = aMap.Find(PP);
TP = (Handle(Geom_Curve)&) aTrans;
#else
TP = Handle(Geom_Curve)::DownCast(aMap.Find(PP));
#endif
}
else {
TP = MgtGeom::Translate(PP);
@ -157,12 +148,8 @@ Handle(PGeom2d_Curve) MgtBRep_TranslateTool::Translate
Handle(PGeom2d_Curve) PP;
if (!TP.IsNull()) {
if (aMap.IsBound(TP)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Persistent) aPers = aMap.Find(TP);
PP = (Handle(PGeom2d_Curve)&) aPers;
#else
PP = Handle(PGeom2d_Curve)::DownCast(aMap.Find(TP));
#endif
}
else {
PP = MgtGeom2d::Translate(TP);
@ -187,12 +174,8 @@ Handle(Geom2d_Curve) MgtBRep_TranslateTool::Translate
Handle(Geom2d_Curve) TP;
if (!PP.IsNull()) {
if (aMap.IsBound(PP)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Transient) aTrans = aMap.Find(PP);
TP = (Handle(Geom2d_Curve)&) aTrans;
#else
TP = Handle(Geom2d_Curve)::DownCast(aMap.Find(PP));
#endif
}
else {
TP = MgtGeom2d::Translate(PP);
@ -217,12 +200,8 @@ Handle(PGeom_Surface) MgtBRep_TranslateTool::Translate
Handle(PGeom_Surface) PP;
if (!TP.IsNull()) {
if (aMap.IsBound(TP)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Persistent) aPers = aMap.Find(TP);
PP = (Handle(PGeom_Surface)&) aPers;
#else
PP = Handle(PGeom_Surface)::DownCast(aMap.Find(TP));
#endif
}
else {
PP = MgtGeom::Translate(TP);
@ -247,12 +226,8 @@ Handle(Geom_Surface) MgtBRep_TranslateTool::Translate
Handle(Geom_Surface) TP;
if (!PP.IsNull()) {
if (aMap.IsBound(PP)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Transient) aTrans = aMap.Find(PP);
TP = (Handle(Geom_Surface)&) aTrans;
#else
TP = Handle(Geom_Surface)::DownCast(aMap.Find(PP));
#endif
}
else {
TP = MgtGeom::Translate(PP);
@ -492,15 +467,10 @@ void MgtBRep_TranslateTool::UpdateVertex
const Handle(PTopoDS_HShape)& S2,
PTColStd_TransientPersistentMap& aMap) const
{
#ifdef MgtBRepSpeedDownCast
Handle(TopoDS_TShape) aTransTShape = S1.TShape();
Handle(BRep_TVertex)& TTV = (Handle(BRep_TVertex)&) aTransTShape;
Handle(PTopoDS_TShape) aPersTShape = S2->TShape();
Handle(PBRep_TVertex)& PTV = (Handle(PBRep_TVertex)&) aPersTShape;
#else
Handle(BRep_TVertex) TTV = Handle(BRep_TVertex)::DownCast(S1.TShape());
Handle(PBRep_TVertex) PTV = Handle(PBRep_TVertex)::DownCast(S2->TShape());
#endif
// Point
PTV->Pnt(TTV->Pnt());
@ -563,16 +533,11 @@ void MgtBRep_TranslateTool::UpdateVertex
TopoDS_Shape& S2,
PTColStd_PersistentTransientMap& aMap) const
{
#ifdef MgtBRepSpeedDownCast
Handle(PTopoDS_TShape) aPersTShape = S1->TShape();
Handle(PBRep_TVertex)& PTV = (Handle(PBRep_TVertex)&) aPersTShape;
Handle(TopoDS_TShape) aTransTShape = S2.TShape();
Handle(BRep_TVertex)& TTV = (Handle(BRep_TVertex)&) aTransTShape;
#else
Handle(PBRep_TVertex) PTV = Handle(PBRep_TVertex)::DownCast(S1->TShape());
Handle(BRep_TVertex) TTV = Handle(BRep_TVertex)::DownCast(S2.TShape());
#endif
// Point
TTV->Pnt(PTV->Pnt());
@ -638,16 +603,11 @@ MgtBRep_TranslateTool::UpdateEdge(const TopoDS_Shape& S1,
const Handle(PTopoDS_HShape)& S2,
PTColStd_TransientPersistentMap& aMap) const
{
#ifdef MgtBRepSpeedDownCast
Handle(TopoDS_TShape) aTransTShape = S1.TShape();
Handle(BRep_TEdge)& TTE = (Handle(BRep_TEdge)&) aTransTShape;
Handle(PTopoDS_TShape) aPersTShape = S2->TShape();
Handle(PBRep_TEdge)& PTE = (Handle(PBRep_TEdge)&) aPersTShape;
#else
Handle(BRep_TEdge) TTE = Handle(BRep_TEdge)::DownCast(S1.TShape());
Handle(PBRep_TEdge) PTE = Handle(PBRep_TEdge)::DownCast(S2->TShape());
#endif
// tolerance
PTE->Tolerance(TTE->Tolerance());
@ -833,16 +793,11 @@ MgtBRep_TranslateTool::UpdateEdge(const Handle(PTopoDS_HShape)& S1,
TopoDS_Shape& S2,
PTColStd_PersistentTransientMap& aMap) const
{
#ifdef MgtBRepSpeedDownCast
Handle(PTopoDS_TShape) aPersTShape = S1->TShape();
Handle(PBRep_TEdge)& PTE = (Handle(PBRep_TEdge)&) aPersTShape;
Handle(TopoDS_TShape) aTransTShape = S2.TShape();
Handle(BRep_TEdge)& TTE = (Handle(BRep_TEdge)&) aTransTShape;
#else
Handle(PBRep_TEdge) PTE = Handle(PBRep_TEdge)::DownCast(S1->TShape());
Handle(BRep_TEdge) TTE = Handle(BRep_TEdge)::DownCast(S2.TShape());
#endif
// tolerance
TTE->Tolerance(PTE->Tolerance());
@ -1014,16 +969,11 @@ MgtBRep_TranslateTool::UpdateFace(const TopoDS_Shape& S1,
const Handle(PTopoDS_HShape)& S2,
PTColStd_TransientPersistentMap& aMap) const
{
#ifdef MgtBRepSpeedDownCast
Handle(TopoDS_TShape) aTransTShape = S1.TShape();
Handle(BRep_TFace)& TTF = (Handle(BRep_TFace)&) aTransTShape;
Handle(PTopoDS_TShape) aPersTShape = S2->TShape();
Handle(PBRep_TFace)& PTF = (Handle(PBRep_TFace)&) aPersTShape;
#else
Handle(BRep_TFace) TTF = Handle(BRep_TFace)::DownCast(S1.TShape());
Handle(PBRep_TFace) PTF = Handle(PBRep_TFace)::DownCast(S2->TShape());
#endif
// natural restriction
PTF->NaturalRestriction(TTF->NaturalRestriction());
@ -1056,16 +1006,11 @@ MgtBRep_TranslateTool::UpdateFace(const Handle(PTopoDS_HShape)& S1,
TopoDS_Shape& S2,
PTColStd_PersistentTransientMap& aMap) const
{
#ifdef MgtBRepSpeedDownCast
Handle(PTopoDS_TShape) aPersTShape = S1->TShape();
Handle(PBRep_TFace)& PTF = (Handle(PBRep_TFace)&) aPersTShape;
Handle(TopoDS_TShape) aTransTShape = S2.TShape();
Handle(BRep_TFace)& TTF = (Handle(BRep_TFace)&) aTransTShape;
#else
Handle(PBRep_TFace) PTF = Handle(PBRep_TFace)::DownCast(S1->TShape());
Handle(BRep_TFace) TTF = Handle(BRep_TFace)::DownCast(S2.TShape());
#endif
// natural restriction
TTF->NaturalRestriction(PTF->NaturalRestriction());

34
src/MgtPoly/MgtPoly.cxx
View File

@ -28,8 +28,6 @@
#include <Poly_Array1OfTriangle.hxx>
#include <PPoly_HArray1OfTriangle.hxx>
#define MgtBRepSpeedDownCast
//=======================================================================
//function : ArrayCopy
//purpose : Copy the gp_Pnt
@ -261,12 +259,8 @@ Handle(Poly_Triangulation) MgtPoly::Translate
if (!PObj.IsNull()) {
if (aMap.IsBound(PObj)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Transient) aTrans = aMap.Find(PObj);
TT = (Handle(Poly_Triangulation)&) aTrans;
#else
TT = Handle(Poly_Triangulation)::DownCast(aMap.Find(PObj));
#endif
}
else { // translate and bind
@ -313,12 +307,8 @@ Handle(PPoly_Triangulation) MgtPoly::Translate
Handle(PPoly_Triangulation) PT;
if (!TObj.IsNull()) {
if (aMap.IsBound(TObj)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Persistent) aPers = aMap.Find(TObj);
PT = (Handle(PPoly_Triangulation)&) aPers;
#else
PT = Handle(PPoly_Triangulation)::DownCast(aMap.Find(TObj));
#endif
}
else {
// myNodes
@ -365,12 +355,8 @@ Handle(Poly_Polygon3D) MgtPoly::Translate
Handle(Poly_Polygon3D) TP;
if (!PObj.IsNull()) {
if (aMap.IsBound(PObj)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Transient) aTrans = aMap.Find(PObj);
TP = (Handle(Poly_Polygon3D)&) aTrans;
#else
TP = Handle(Poly_Polygon3D)::DownCast(aMap.Find(PObj));
#endif
}
else {
@ -406,12 +392,8 @@ Handle(PPoly_Polygon3D) MgtPoly::Translate
Handle(PPoly_Polygon3D) PT;
if (!TObj.IsNull()) {
if (aMap.IsBound(TObj)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Persistent) aPers = aMap.Find(TObj);
PT = (Handle(PPoly_Polygon3D)&) aPers;
#else
PT = Handle(PPoly_Polygon3D)::DownCast(aMap.Find(TObj));
#endif
}
else {
// myNodes
@ -447,12 +429,8 @@ Handle(Poly_Polygon2D) MgtPoly::Translate
Handle(Poly_Polygon2D) TP;
if (!PObj.IsNull()) {
if (aMap.IsBound(PObj)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Transient) aTrans = aMap.Find(PObj);
TP = (Handle(Poly_Polygon2D)&) aTrans;
#else
TP = Handle(Poly_Polygon2D)::DownCast(aMap.Find(PObj));
#endif
}
else {
// myNodes
@ -481,12 +459,8 @@ Handle(PPoly_Polygon2D) MgtPoly::Translate
Handle(PPoly_Polygon2D) PT;
if (!TObj.IsNull()) {
if (aMap.IsBound(TObj)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Persistent) aPers = aMap.Find(TObj);
PT = (Handle(PPoly_Polygon2D)&) aPers;
#else
PT = Handle(PPoly_Polygon2D)::DownCast(aMap.Find(TObj));
#endif
}
else {
// myNodes
@ -516,12 +490,8 @@ Handle(Poly_PolygonOnTriangulation) MgtPoly::Translate
Handle(Poly_PolygonOnTriangulation) TP;
if (!PObj.IsNull()) {
if (aMap.IsBound(PObj)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Transient) aTrans = aMap.Find(PObj);
TP = (Handle(Poly_PolygonOnTriangulation)&) aTrans;
#else
TP = Handle(Poly_PolygonOnTriangulation)::DownCast(aMap.Find(PObj));
#endif
}
else {
@ -564,12 +534,8 @@ Handle(PPoly_PolygonOnTriangulation) MgtPoly::Translate
Handle(PPoly_PolygonOnTriangulation) PT;
if (!TObj.IsNull()) {
if (aMap.IsBound(TObj)) {
#ifdef MgtBRepSpeedDownCast
Handle(Standard_Persistent) aPers = aMap.Find(TObj);
PT = (Handle(PPoly_PolygonOnTriangulation)&) aPers;
#else
PT = Handle(PPoly_PolygonOnTriangulation)::DownCast(aMap.Find(TObj));
#endif
}
else {
// myNodes

19
src/OSD/OSD_File.cxx
View File

@ -1429,13 +1429,6 @@ OSD_KindFile OSD_File :: KindOfFile () const {
return retVal;
} // end OSD_File :: KindOfFile
#define PRO13792
#ifndef PRO13792
OSD_File OSD_File :: BuildTemporary () {
OSD_Protection prt;
OSD_File retVal;
#ifdef VAC
char tmpbuf [MAX_PATH];
@ -1455,16 +1448,6 @@ OSD_File OSD_File :: BuildTemporary () {
TCollection_AsciiString fileName ( _ttmpnam ( NULL ) );
#endif
OSD_Path filePath ( fileName );
retVal.SetPath ( filePath );
retVal.Build ( OSD_ReadWrite, prt );
return retVal;
} // end OSD_File :: BuildTemporary
#else // PRO13792
//-------------------------------------------------debutpri???980424
@ -1548,8 +1531,6 @@ OSD_File OSD_File :: BuildTemporary () {
} // end OSD_File :: BuildTemporary
#endif // PRO13792
//-------------------------------------------------finpri???980424
#if defined(__CYGWIN32__) || defined(__MINGW32__)

3
src/Prs3d/Prs3d_ArrowAspect.cdl
View File

@ -14,9 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- Modified GG : GER61351 01/02/00 Add SetColor() & Aspect() methods
class ArrowAspect from Prs3d inherits BasicAspect from Prs3d
---Purpose: A framework for displaying arrows in representations
-- of dimensions and relations.

8
src/Prs3d/Prs3d_ArrowAspect.cxx
View File

@ -12,28 +12,22 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define IMP120100 //GG 01/01/00 Add SetColor() methods
#include <Prs3d_ArrowAspect.ixx>
Prs3d_ArrowAspect::Prs3d_ArrowAspect ()
: myAngle(M_PI/180.*10), myLength(1.) {
#ifdef IMP120100
myArrowAspect =
new Graphic3d_AspectLine3d (
Quantity_Color(Quantity_NOC_WHITE), Aspect_TOL_SOLID, 1.0);
#endif
}
Prs3d_ArrowAspect::Prs3d_ArrowAspect (const Quantity_PlaneAngle anAngle,
const Quantity_Length aLength)
: myAngle(anAngle), myLength(aLength) {
#ifdef IMP120100
myArrowAspect =
new Graphic3d_AspectLine3d (
Quantity_Color(Quantity_NOC_WHITE), Aspect_TOL_SOLID, 1.0);
#endif
}
void Prs3d_ArrowAspect::SetAngle ( const Quantity_PlaneAngle anAngle) {
@ -55,7 +49,6 @@ Quantity_Length Prs3d_ArrowAspect::Length () const
return myLength;
}
#ifdef IMP120100
void Prs3d_ArrowAspect::SetColor(const Quantity_Color &aColor) {
myArrowAspect->SetColor(aColor);
}
@ -67,4 +60,3 @@ void Prs3d_ArrowAspect::SetColor(const Quantity_NameOfColor aColor) {
Handle(Graphic3d_AspectLine3d) Prs3d_ArrowAspect::Aspect() const {
return myArrowAspect;
}
#endif

4
src/Prs3d/Prs3d_IsoAspect.cdl
View File

@ -14,10 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
class IsoAspect from Prs3d inherits LineAspect from Prs3d
---Purpose: A framework to define the display attributes of isoparameters.
-- This framework can be used to modify the default

5
src/Prs3d/Prs3d_IsoAspect.cxx
View File

@ -12,12 +12,8 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define GER61351 //GG_171199 Enable to set an object RGB color
// instead a restricted object NameOfColor.
#include <Prs3d_IsoAspect.ixx>
#ifdef GER61351
Prs3d_IsoAspect::Prs3d_IsoAspect(const Quantity_Color &aColor,
const Aspect_TypeOfLine aType,
const Standard_Real aWidth,
@ -25,7 +21,6 @@ Prs3d_IsoAspect::Prs3d_IsoAspect(const Quantity_Color &aColor,
:Prs3d_LineAspect (aColor,aType,aWidth) {
myNumber = aNumber;
}
#endif
Prs3d_IsoAspect::Prs3d_IsoAspect(const Quantity_NameOfColor aColor,
const Aspect_TypeOfLine aType,

4
src/Prs3d/Prs3d_LineAspect.cdl
View File

@ -14,10 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
class LineAspect from Prs3d inherits BasicAspect from Prs3d
---Purpose: A framework for defining how a line will be displayed
-- in a presentation. Aspects of line display include

7
src/Prs3d/Prs3d_LineAspect.cxx
View File

@ -12,18 +12,13 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define GER61351 //GG_171199 Enable to set an object RGB color
// instead a restricted object NameOfColor.
#include <Prs3d_LineAspect.ixx>
#ifdef GER61351
Prs3d_LineAspect::Prs3d_LineAspect (const Quantity_Color &aColor,
const Aspect_TypeOfLine aType,
const Standard_Real aWidth) {
myAspect = new Graphic3d_AspectLine3d(aColor,aType,aWidth);
}
#endif
Prs3d_LineAspect::Prs3d_LineAspect (const Quantity_NameOfColor aColor,
const Aspect_TypeOfLine aType,
@ -33,11 +28,9 @@ Prs3d_LineAspect::Prs3d_LineAspect (const Quantity_NameOfColor aColor,
(Quantity_Color(aColor),aType,aWidth);
}
#ifdef GER61351
void Prs3d_LineAspect::SetColor(const Quantity_Color &aColor) {
myAspect->SetColor(aColor);
}
#endif
void Prs3d_LineAspect::SetColor(const Quantity_NameOfColor aColor) {
myAspect->SetColor(Quantity_Color(aColor));

4
src/Prs3d/Prs3d_PointAspect.cdl
View File

@ -14,10 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
class PointAspect from Prs3d inherits BasicAspect from Prs3d
---Purpose: This class defines attributes for the points

7
src/Prs3d/Prs3d_PointAspect.cxx
View File

@ -12,18 +12,13 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define GER61351 //GG_171199 Enable to set an object RGB color
// instead a restricted object NameOfColor.
#include <Prs3d_PointAspect.ixx>
#ifdef GER61351
Prs3d_PointAspect::Prs3d_PointAspect (const Aspect_TypeOfMarker aType,
const Quantity_Color &aColor,
const Standard_Real aScale) {
myAspect = new Graphic3d_AspectMarker3d(aType,aColor,aScale);
}
#endif
Prs3d_PointAspect::Prs3d_PointAspect (const Aspect_TypeOfMarker aType,
const Quantity_NameOfColor aColor,
@ -42,11 +37,9 @@ Prs3d_PointAspect::Prs3d_PointAspect (const Quantity_Color &aColor,
(aColor,aWidth,aHeight,aTexture);
}
#ifdef GER61351
void Prs3d_PointAspect::SetColor(const Quantity_Color &aColor) {
myAspect->SetColor(aColor);
}
#endif
void Prs3d_PointAspect::SetColor(const Quantity_NameOfColor aColor) {
myAspect->SetColor(Quantity_Color(aColor));

3
src/Prs3d/Prs3d_Presentation.cdl
View File

@ -14,9 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- Modified: GG IMP020200 Add Transformation() method
class Presentation from Prs3d inherits Structure from Graphic3d
---Purpose: Defines a presentation object which can be displayed,

4
src/Prs3d/Prs3d_Presentation.cxx
View File

@ -14,8 +14,6 @@
// Modified: 22/03/04 ; SAN : OCC4895 High-level interface for controlling polygon offsets
#define IMP020200 //GG Add Transformation() method
#include <Prs3d_Presentation.ixx>
#include <TColStd_Array2OfReal.hxx>
#include <Graphic3d_Structure.hxx>
@ -120,7 +118,6 @@ void Prs3d_Presentation::Transform(const Handle(Geom_Transformation)& aTransform
SetTransform(Array, Graphic3d_TOC_REPLACE);
}
#ifdef IMP020200
//=======================================================================
//function : Transformation
//purpose :
@ -140,7 +137,6 @@ TColStd_Array2OfReal matrix(1,4,1,4);
return gtrsf;
}
#endif
//=======================================================================
//function : Place

7
src/Prs3d/Prs3d_ShadingAspect.cdl
View File

@ -14,13 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
-- Parameters the color model rule (not especially the front & back side)
-- Add the SetTransparency() method.
-- Add the Color(),Material() and Transparency() methods
class ShadingAspect from Prs3d inherits BasicAspect from Prs3d
---Purpose: A framework to define the display of shading.
-- The attributes which make up this definition include:

3
src/Prs3d/Prs3d_TextAspect.cdl
View File

@ -14,9 +14,6 @@
-- Alternatively, this file may be used under the terms of Open CASCADE
-- commercial license or contractual agreement.
-- GG : GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
-- the restricted NameOfColor.
class TextAspect from Prs3d inherits BasicAspect from Prs3d
---Purpose: Defines the attributes when displaying a text.

6
src/Prs3d/Prs3d_TextAspect.cxx
View File

@ -14,10 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define GER61351 //GG_171199 Enable to set an object RGB color
// instead a restricted object NameOfColor.
#include <Prs3d_TextAspect.ixx>
#include <Quantity_Color.hxx>
#include <Font_NameOfFont.hxx>
@ -36,11 +32,9 @@ Prs3d_TextAspect::Prs3d_TextAspect ()
0.);
}
#ifdef GER61351
void Prs3d_TextAspect::SetColor(const Quantity_Color &aColor) {
myTextAspect->SetColor(aColor);
}
#endif
void Prs3d_TextAspect::SetColor(const Quantity_NameOfColor aColor) {
myTextAspect->SetColor(Quantity_Color(aColor));

4
src/PrsMgr/PrsMgr_PresentableObject.cdl
View File

@ -23,10 +23,6 @@
-- ->Insert Locations Methods...
-- Rob (16/12/97) -> Get the list of modes to be updated
-- -> Flags all the Prs to be updated...
-- GG IMP020200 -> Presentations() method become protected
-- and no more private.
-- SAN (22/03/04) -> OCC4895 High-level interface for controlling
-- polygon offsets: Fill() made protected virtual.
deferred class PresentableObject from PrsMgr inherits TShared from MMgt

20
src/Quantity/Quantity_Color.cxx
View File

@ -13,10 +13,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define IMP310300 //GG Don't raise in constructor when an HLS color
// is defined with hue sets to undefined (grey color)
//-Version
//-Design Declaration des variables specifiques aux couleurs
@ -109,12 +105,8 @@ Quantity_Color::Quantity_Color (const Quantity_Parameter R1, const Quantity_Para
break;
case Quantity_TOC_HLS :
#ifdef IMP310300
if ( (R1 < 0. && R1 != RGBHLS_H_UNDEFINED && R3 != 0.0)
|| (R1 > 360.) ||
#else
if ( R1 < 0. || R1 > 359. ||
#endif
R2 < 0. || R2 > 1. ||
R3 < 0. || R3 > 1. )
Standard_OutOfRange::Raise ("Color out");
@ -192,11 +184,7 @@ void Quantity_Color::SetValues (const Quantity_Parameter R1, const Quantity_Para
break;
case Quantity_TOC_HLS :
#ifdef IMP310300
if ( R1 < 0. || R1 > 360. ||
#else
if ( R1 < 0. || R1 > 359. ||
#endif
R2 < 0. || R2 > 1. ||
R3 < 0. || R3 > 1. )
Standard_OutOfRange::Raise ("Color out");
@ -3797,15 +3785,7 @@ void call_hlsrgb (float h, float l, float s, float& r, float& g, float& b)
hcopy = h;
lmuls = l * s;
#ifdef IMP310300
if (s == 0.0 && h == RGBHLS_H_UNDEFINED) {
#else
if (s == 0.0) {
if (h == RGBHLS_H_UNDEFINED)
/* cas teinte indefinie */
h = RGBHLS_H_UNDEFINED;
else
#endif
/* cas achromatique */
r = g = b = l;
}

27
src/Resource/Resource_Shiftjis.h
View File

@ -14,16 +14,6 @@
commercial license or contractual agreement.
*/
#define CTS17340 /*GG_230797
changer la definition sjis des caracteres
" (FF02) -> sjis A1ED
' (FF07) -> sjis A1EC
- (FF0D) -> sjis A1DD
\ (FF3C) -> sjis A1A1 (sans equivalent -> blank)
~ (FF5E) -> sjis 223D
(FF5F) -> sjis A1A1 (sans equivalent -> blank)
*/
static char16 unisjis [65536] = {
0x0 , 0x0 , 0x0 , 0x0 ,
0x0 , 0x0 , 0x0 , 0x0 ,
@ -16345,19 +16335,10 @@ static char16 unisjis [65536] = {
0x0 , 0x0 , 0x0 , 0x0 ,
0x0 , 0x0 , 0x0 , 0x0 ,
0x0 , 0x0 , 0x0 , 0x0 ,
#ifdef CTS17340
0x0 , 0x8149 , 0xa1ed , 0x8194 ,
0x8190 , 0x8193 , 0x8195 , 0xa1ec ,
#else
0x0 , 0x8149 , 0x0 , 0x8194 ,
0x8190 , 0x8193 , 0x8195 , 0x0 ,
#endif
0x8169 , 0x816a , 0x8196 , 0x817b ,
#ifdef CTS17340
0x8143 , 0xa1dd , 0x8144 , 0x815e ,
#else
0x8143 , 0x0 , 0x8144 , 0x815e ,
#endif
0x824f , 0x8250 , 0x8251 , 0x8252 ,
0x8253 , 0x8254 , 0x8255 , 0x8256 ,
0x8257 , 0x8258 , 0x8146 , 0x8147 ,
@ -16369,11 +16350,7 @@ static char16 unisjis [65536] = {
0x826f , 0x8270 , 0x8271 , 0x8272 ,
0x8273 , 0x8274 , 0x8275 , 0x8276 ,
0x8277 , 0x8278 , 0x8279 , 0x816d ,
#ifdef CTS17340
0xa1a1 , 0x816e , 0x814f , 0x8151 ,
#else
0x0 , 0x816e , 0x814f , 0x8151 ,
#endif
0x814d , 0x8281 , 0x8282 , 0x8283 ,
0x8284 , 0x8285 , 0x8286 , 0x8287 ,
0x8288 , 0x8289 , 0x828a , 0x828b ,
@ -16381,11 +16358,7 @@ static char16 unisjis [65536] = {
0x8290 , 0x8291 , 0x8292 , 0x8293 ,
0x8294 , 0x8295 , 0x8296 , 0x8297 ,
0x8298 , 0x8299 , 0x829a , 0x816f ,
#ifdef CTS17340
0x8162 , 0x8170 , 0x223d , 0xa1a1 ,
#else
0x8162 , 0x8170 , 0x0 , 0x0 ,
#endif
0x0 , 0xa1 , 0xa2 , 0xa3 ,
0xa4 , 0xa5 , 0xa6 , 0xa7 ,
0xa8 , 0xa9 , 0xaa , 0xab ,

5
src/Select3D/Select3D_SensitiveTriangulation.cxx
View File

@ -18,9 +18,6 @@
// fix bug on Compute Depth (don't forget
// Location...)
#define BUC60858 //GG 27/03/01 Avoid to crash when selecting
// a triangle containing confused or aligned points.
#include <Select3D_SensitiveTriangulation.ixx>
#include <gp_Pnt2d.hxx>
#include <Poly.hxx>
@ -554,12 +551,10 @@ Standard_Real Select3D_SensitiveTriangulation::ComputeDepth(const gp_Lin& thePic
SingularCase = (SingularCase == -1) ? 1 : 2;
}
#ifdef BUC60858
if (Vtr[2].SquareMagnitude() <= Precision::Confusion())
{
if( SingularCase < 0 ) SingularCase = 1;
}
#endif
// 3 pts mixed...
if (SingularCase ==2)

5
src/SelectMgr/SelectMgr_ViewerSelector.lxx
View File

@ -12,9 +12,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define OCC9026 //AEL Additional method to optimize performance
//of the FindSelectedOwnerFromShape() method.
inline Standard_Real SelectMgr_ViewerSelector::Sensitivity() const
{
return mytolerance;
@ -40,9 +37,7 @@ inline const SelectBasics_PickArgs& SelectMgr_ViewerSelector::LastPickingArgumen
return myLastPickArgs;
}
#ifdef OCC9026
inline const SelectMgr_DataMapOfIntegerSensitive& SelectMgr_ViewerSelector::Primitives() const
{
return myentities;
}
#endif

25
src/Standard/Standard_GUID.cxx
View File

@ -21,7 +21,6 @@
#define Standard_GUID_SIZE_ALLOC Standard_GUID_SIZE+1
//Fixes incorrect treatment of GUID given as a string with invalid format
#define OCC669
//=======================================================================
//function : Standard_GUID_MatchChar
@ -35,9 +34,7 @@ Standard_Integer Standard_GUID_MatchChar(const Standard_CString buffer,
while(*tmpbuffer != '\0' && *tmpbuffer != aChar) {tmpbuffer++; result++;}
#ifdef OCC669
if(*tmpbuffer == '\0') return -1; //The searched symbol wasn't found
#endif
if (result >= 0) result++;
@ -59,9 +56,7 @@ Standard_PCharacter Standard_GUID_GetValue32(Standard_PCharacter tmpBuffer,
strtmp[pos] = '\0';
my32b = (Standard_Integer) strtoul(strtmp, (char **)NULL, 16);
}
#ifdef OCC669
else return NULL;
#endif
return &tmpBuffer[pos+1];
}
//=======================================================================
@ -80,9 +75,7 @@ Standard_PCharacter Standard_GUID_GetValue16(Standard_PCharacter tmpBuffer,
strtmp[pos] = '\0';
my32b = (Standard_ExtCharacter) strtoul(strtmp, (char **)NULL, 16);
}
#ifdef OCC669
else return NULL;
#endif
// cout << "V16 :" << hex(my32b) << endl;
return &tmpBuffer[pos+1];
}
@ -185,11 +178,8 @@ Standard_GUID::Standard_GUID(const Standard_CString aGuid)
{
char* tmpBuffer =(char*) aGuid;
#ifdef OCC669
if(!CheckGUIDFormat(tmpBuffer)) Standard_RangeError::Raise("Invalid format of GUID");
#endif
#ifdef OCC669
if((tmpBuffer = Standard_GUID_GetValue32(tmpBuffer,my32b)) == NULL)
Standard_RangeError::Raise("Invalid format of GUID");
if((tmpBuffer = Standard_GUID_GetValue16(tmpBuffer,my16b1)) == NULL)
@ -198,12 +188,6 @@ Standard_GUID::Standard_GUID(const Standard_CString aGuid)
Standard_RangeError::Raise("Invalid format of GUID");
if((tmpBuffer = Standard_GUID_GetValue16(tmpBuffer,my16b3)) == NULL)
Standard_RangeError::Raise("Invalid format of GUID");
#else
tmpBuffer = Standard_GUID_GetValue32(tmpBuffer,my32b);
tmpBuffer = Standard_GUID_GetValue16(tmpBuffer,my16b1);
tmpBuffer = Standard_GUID_GetValue16(tmpBuffer,my16b2);
tmpBuffer = Standard_GUID_GetValue16(tmpBuffer,my16b3);
#endif
tmpBuffer = Standard_GUID_GetValue8(tmpBuffer,my8b1);
tmpBuffer = Standard_GUID_GetValue8(tmpBuffer,my8b2);
tmpBuffer = Standard_GUID_GetValue8(tmpBuffer,my8b3);
@ -234,11 +218,8 @@ Standard_GUID::Standard_GUID(const Standard_ExtString aGuid)
tmpBuffer[i] = '\0';
#ifdef OCC669
if(!CheckGUIDFormat(tmpBuffer)) Standard_RangeError::Raise("Invalid format of GUID");
#endif
#ifdef OCC669
if((tmpBuffer = Standard_GUID_GetValue32(tmpBuffer,my32b)) == NULL)
Standard_RangeError::Raise("Invalid format of GUID");
if((tmpBuffer = Standard_GUID_GetValue16(tmpBuffer,my16b1)) == NULL)
@ -247,12 +228,6 @@ Standard_GUID::Standard_GUID(const Standard_ExtString aGuid)
Standard_RangeError::Raise("Invalid format of GUID");
if((tmpBuffer = Standard_GUID_GetValue16(tmpBuffer,my16b3)) == NULL)
Standard_RangeError::Raise("Invalid format of GUID");
#else
tmpBuffer = Standard_GUID_GetValue32(tmpBuffer,my32b);
tmpBuffer = Standard_GUID_GetValue16(tmpBuffer,my16b1);
tmpBuffer = Standard_GUID_GetValue16(tmpBuffer,my16b2);
tmpBuffer = Standard_GUID_GetValue16(tmpBuffer,my16b3);
#endif
tmpBuffer = Standard_GUID_GetValue8(tmpBuffer,my8b1);
tmpBuffer = Standard_GUID_GetValue8(tmpBuffer,my8b2);
tmpBuffer = Standard_GUID_GetValue8(tmpBuffer,my8b3);

1
src/StdPrs/StdPrs_Curve.cxx
View File

@ -16,7 +16,6 @@
// Great zoom leads to non-coincidence of
// a point and non-infinite lines passing throught this point:
#define OCC64
#include <StdPrs_Curve.ixx>

1
src/StdPrs/StdPrs_DeflectionCurve.cxx
View File

@ -14,7 +14,6 @@
// Great zoom leads to non-coincidence of
// a point and non-infinite lines passing throught this point:
#define OCC64
#include <StdPrs_DeflectionCurve.ixx>

3
src/StdPrs/StdPrs_ShadedSurface.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define G005 //ATS,GG 04/01/01 Use PrimitiveArray instead Sets of primitives
// for performance improvment
#include <StdPrs_ShadedSurface.ixx>
#include <Graphic3d_ArrayOfTriangleStrips.hxx>

5
src/StdPrs/StdPrs_ToolRFace.cxx
View File

@ -18,9 +18,6 @@
#include <TopoDS.hxx>
#include <Adaptor2d_Curve2d.hxx>
#define OCC316
//=======================================================================
//function : StdPrs_ToolRFace
//purpose :
@ -100,9 +97,7 @@ void StdPrs_ToolRFace::Next()
BRep_Tool::CurveOnSurface(TopoDS::Edge(myExplorer.Current()),
myFace,
U1,U2);
#ifdef OCC316
if ( !C.IsNull() )
#endif
DummyCurve.Load(C,U1,U2);
}
}

23
src/StdSelect/StdSelect_BRepOwner.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60876 //GG_050401 Enable to highlight something
// with a specific hilight mode
#include <StdSelect_BRepOwner.ixx>
#include <SelectBasics_EntityOwner.hxx>
@ -64,11 +61,7 @@ Standard_Boolean StdSelect_BRepOwner::
IsHilighted(const Handle(PrsMgr_PresentationManager)& PM,
const Standard_Integer aMode) const
{
#ifdef BUC60876
Standard_Integer M = (aMode < 0) ? myCurMode : aMode;
#else
Standard_Integer M = (myCurMode==-1) ? aMode:myCurMode;
#endif
if(myPrsSh.IsNull())
return PM->IsHighlighted(Selectable(),M);
return PM->IsHighlighted(myPrsSh,M);
@ -82,11 +75,7 @@ void StdSelect_BRepOwner::Hilight(const Handle(PrsMgr_PresentationManager)& PM,
const Standard_Integer aMode)
{
#ifdef BUC60876
Standard_Integer M = (aMode < 0) ? myCurMode : aMode;
#else
Standard_Integer M = (myCurMode==-1) ? aMode:myCurMode;
#endif
Handle(SelectMgr_SelectableObject) aSel = Selectable();
if (myFromDecomposition)
{
@ -129,11 +118,7 @@ void StdSelect_BRepOwner::HilightWithColor(const Handle(PrsMgr_PresentationManag
const Quantity_NameOfColor aCol,
const Standard_Integer aMode)
{
#ifdef BUC60876
Standard_Integer M = (aMode < 0) ? myCurMode : aMode;
#else
Standard_Integer M = (myCurMode==-1) ? aMode:myCurMode;
#endif
Handle(SelectMgr_SelectableObject) aSel = Selectable();
if (myFromDecomposition)
{
@ -178,11 +163,7 @@ void StdSelect_BRepOwner::HilightWithColor(const Handle(PrsMgr_PresentationManag
void StdSelect_BRepOwner::Unhilight(const Handle(PrsMgr_PresentationManager)& PM,
const Standard_Integer aMode)
{
#ifdef BUC60876
Standard_Integer M = (aMode < 0) ? myCurMode : aMode;
#else
Standard_Integer M = (myCurMode==-1) ? aMode:myCurMode;
#endif
if(myPrsSh.IsNull() || !myFromDecomposition)
PM->Unhighlight(Selectable(),M);
else
@ -192,11 +173,7 @@ void StdSelect_BRepOwner::Unhilight(const Handle(PrsMgr_PresentationManager)& PM
void StdSelect_BRepOwner::Clear(const Handle(PrsMgr_PresentationManager)& PM,
const Standard_Integer aMode)
{
#ifdef BUC60876
Standard_Integer M = (aMode < 0) ? myCurMode : aMode;
#else
Standard_Integer M = (myCurMode==-1) ? aMode:myCurMode;
#endif
if (!myPrsSh.IsNull())
PM->Clear(myPrsSh,M);
myPrsSh.Nullify();

15
src/StdSelect/StdSelect_FaceFilter.cxx
View File

@ -14,9 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#define BUC60576 //GG_5/10/99 Adds Cone to enum TypeOfFace
#include <StdSelect_FaceFilter.ixx>
#include <BRepAdaptor_Surface.hxx>
#include <TopoDS_Face.hxx>
@ -72,20 +69,12 @@ IsOk(const Handle(SelectMgr_EntityOwner)& EO) const
case StdSelect_Sphere:
{
BRepAdaptor_Surface surf(TopoDS::Face(anobj));
#ifdef BUC60576
return (surf.GetType() == GeomAbs_Sphere);
#else
return (surf.GetType() == GeomAbs_Cone);
#endif
}
case StdSelect_Torus:
{
BRepAdaptor_Surface surf(TopoDS::Face(anobj));
#ifdef BUC60576
return ( surf.GetType() == GeomAbs_Torus);
#else
return ( surf.GetType() == GeomAbs_Plane || surf.GetType() == GeomAbs_Cone);
#endif
}
case StdSelect_Revol:
{
@ -93,20 +82,16 @@ IsOk(const Handle(SelectMgr_EntityOwner)& EO) const
return ( surf.GetType() == GeomAbs_Cylinder ||
surf.GetType() == GeomAbs_Cone ||
surf.GetType() == GeomAbs_Torus
#ifdef BUC60576
||
surf.GetType() == GeomAbs_Sphere ||
surf.GetType() == GeomAbs_SurfaceOfRevolution
#endif
);
}
#ifdef BUC60576
case StdSelect_Cone: // waiting for the free cdl, it is used for Cone
{
BRepAdaptor_Surface surf(TopoDS::Face(anobj));
return (surf.GetType() == GeomAbs_Cone);
}
#endif
}
return Standard_False;
}

4
src/TDF/TDF_Attribute.cxx
View File

@ -38,8 +38,6 @@
#undef TDF_DATA_COMMIT_OPTIMIZED
#define BUC60879
//=======================================================================
//function : TDF_Attribute
//purpose : Initializes fields.
@ -224,14 +222,12 @@ Standard_Boolean TDF_Attribute::AfterRetrieval
(const Standard_Boolean /*forceIt*/)
{ return Standard_True; }
#ifdef BUC60879
//=======================================================================
//function : BeforeCommitTransaction
//purpose :
//=======================================================================
void TDF_Attribute::BeforeCommitTransaction() {}
#endif
//=======================================================================
//function : Backup

5
src/TDF/TDF_CopyLabel.cxx
View File

@ -36,7 +36,6 @@
// Therefore, these attributes shouldn't be considered by the COPY mechanism and
// the label should be considered as a self-contained.
// Correction of the bug consists of ignoring the attributes not involved by the COPY operation.
#define BUC60813
//=======================================================================
//function : TDF_CopyLabel
@ -162,11 +161,7 @@ void TDF_CopyLabel::Perform()
{
myIsDone = Standard_False;
if(mySL.Data()->Root().IsDifferent(myTL.Data()->Root()) && //TDF_Data is not the same
#ifdef BUC60813
!TDF_Tool::IsSelfContained(mySL, myFilter)) return; //source label isn't self-contained
#else
!TDF_Tool::IsSelfContained(mySL)) return;
#endif
else {
#ifdef OCCT_DEBUG
cout << "THE SAME Data" <<endl;

4
src/TDF/TDF_Data.cxx
View File

@ -41,8 +41,6 @@
#undef DEB_DELTA_CREATION
#undef TDF_DATA_COMMIT_OPTIMIZED
#define BUC60879
#ifdef OCCT_DEBUG_DELTA
#define TDF_Data_DebugModified(ACTION) \
cout<<"After "<<ACTION<<" #"<<myTransaction+1<<", DF "<<this<<" had "<<myNbTouchedAtt<<" attribute(s) touched. Time = "<<myTime<<endl; \
@ -221,10 +219,8 @@ Standard_Integer TDF_Data::CommitTransaction
itr1.Next();
// currentAtt = itr1.Value();
#ifdef BUC60879
// A callback:
aPtrCurrentAtt->BeforeCommitTransaction();
#endif
backupAtt = aPtrCurrentAtt->myBackup;

6
src/TDataStd/TDataStd_IntegerArray.cxx
View File

@ -17,8 +17,6 @@
#include <TDataStd_IntegerArray.ixx>
#include <TDataStd_DeltaOnModificationOfIntArray.hxx>
#include <TDF_DefaultDeltaOnModification.hxx>
#define OCC925
#define OCC2932
//=======================================================================
//function : GetID
@ -48,9 +46,7 @@ TDataStd_IntegerArray::TDataStd_IntegerArray()
void TDataStd_IntegerArray::Init(const Standard_Integer lower,
const Standard_Integer upper)
{
#ifdef OCC925
Backup();
#endif
myValue = new TColStd_HArray1OfInteger(lower, upper, 0);
}
@ -155,7 +151,6 @@ void TDataStd_IntegerArray::ChangeArray(const Handle(TColStd_HArray1OfInteger)&
Standard_Integer anUpper = newArray->Upper();
Standard_Boolean aDimEqual = Standard_False;
Standard_Integer i;
#ifdef OCC2932
if(Lower() == aLower && Upper() == anUpper ) {
aDimEqual = Standard_True;
@ -171,7 +166,6 @@ void TDataStd_IntegerArray::ChangeArray(const Handle(TColStd_HArray1OfInteger)&
return;
}
}
#endif
Backup();
// Handles of myValue of current and backuped attributes will be different!

3
src/TDataStd/TDataStd_RealArray.cxx
View File

@ -17,7 +17,6 @@
#include <TDataStd_RealArray.ixx>
#include <TDataStd_DeltaOnModificationOfRealArray.hxx>
#include <TDF_DefaultDeltaOnModification.hxx>
#define OCC2932
//=======================================================================
//function : GetID
@ -155,7 +154,6 @@ void TDataStd_RealArray::ChangeArray(const Handle(TColStd_HArray1OfReal)& newArr
Standard_Boolean aDimEqual = Standard_False;
Standard_Integer i;
#ifdef OCC2932
if (Lower() == aLower && Upper() == anUpper ) {
aDimEqual = Standard_True;
Standard_Boolean isEqual = Standard_True;
@ -170,7 +168,6 @@ void TDataStd_RealArray::ChangeArray(const Handle(TColStd_HArray1OfReal)& newArr
return;
}
}
#endif
Backup();

4
src/TDataStd/TDataStd_Relation.cxx
View File

@ -19,8 +19,6 @@
#include <TDataStd_Variable.hxx>
#include <TDF_ListIteratorOfAttributeList.hxx>
#define OCC387
//=======================================================================
//function : GetID
//purpose :
@ -76,9 +74,7 @@ void TDataStd_Relation::SetRelation(const TCollection_ExtendedString& R)
// OCC2932 correction
if(myRelation == R) return;
#ifdef OCC387
Backup();
#endif
myRelation = R;
}

19
src/TDataStd/TDataStd_TreeNode.cxx
View File

@ -18,12 +18,6 @@
#include <TDF_Label.hxx>
#include <Standard_DomainError.hxx>
// This bug concerns the method IsDescendant():
#define BUC60817
// This bug concerns the method BeforeForget() - Forget/Resume, Undo/Redo behaviour of the attribute
#define BUC60844
//=======================================================================
//function : Find
//purpose :
@ -317,8 +311,6 @@ Standard_Boolean TDataStd_TreeNode::IsAscendant (const Handle(TDataStd_TreeNode)
Standard_Boolean TDataStd_TreeNode::IsDescendant (const Handle(TDataStd_TreeNode)& ofTN) const
{
#ifdef BUC60817
TDataStd_TreeNode* O = (TDataStd_TreeNode*) this;
while (O->myFather != NULL)
{
@ -326,13 +318,6 @@ Standard_Boolean TDataStd_TreeNode::IsDescendant (const Handle(TDataStd_TreeNode
return Standard_True;
O = O->myFather;
}
#else
Handle(TDataStd_TreeNode) current;
for (current = this; current = current->Father(); current->HasFather()) {
if (current == ofTN) return Standard_True;
}
#endif
return Standard_False;
}
@ -555,14 +540,10 @@ void TDataStd_TreeNode::AfterAddition() {
//=======================================================================
void TDataStd_TreeNode::BeforeForget() {
#ifdef BUC60844
if (!IsBackuped()) {
Remove();
while (HasFirst()) First()->Remove();
}
#else
if (!IsBackuped()) Remove();
#endif
}
//=======================================================================

4
src/TDataXtd/TDataXtd_Axis.cxx
View File

@ -33,8 +33,6 @@
#include <BRepAdaptor_Curve.hxx>
#include <GeomAbs_CurveType.hxx>
#define OCC2932
//=======================================================================
//function : GetID
//purpose :
@ -73,7 +71,6 @@ Handle(TDataXtd_Axis) TDataXtd_Axis::Set (const TDF_Label& L, const gp_Lin& line
{
Handle(TDataXtd_Axis) A = Set (L);
#ifdef OCC2932
Handle(TNaming_NamedShape) aNS;
if(L.FindAttribute(TNaming_NamedShape::GetID(), aNS)) {
if(!aNS->Get().IsNull())
@ -93,7 +90,6 @@ Handle(TDataXtd_Axis) TDataXtd_Axis::Set (const TDF_Label& L, const gp_Lin& line
}
}
}
#endif
TNaming_Builder B (L);
B.Generated (BRepBuilderAPI_MakeEdge(line));
return A;

4
src/TDataXtd/TDataXtd_Plane.cxx
View File

@ -30,8 +30,6 @@
#include <Geom_Plane.hxx>
#include <GeomLib_IsPlanarSurface.hxx>
#define OCC2932
//=======================================================================
//function : GetID
//purpose :
@ -70,7 +68,6 @@ Handle(TDataXtd_Plane) TDataXtd_Plane::Set (const TDF_Label& L, const gp_Pln& P)
{
Handle(TDataXtd_Plane) A = Set (L);
#ifdef OCC2932
Handle(TNaming_NamedShape) aNS;
if(L.FindAttribute(TNaming_NamedShape::GetID(), aNS)) {
if(!aNS->Get().IsNull())
@ -94,7 +91,6 @@ Handle(TDataXtd_Plane) TDataXtd_Plane::Set (const TDF_Label& L, const gp_Pln& P)
}
}
}
#endif
TNaming_Builder B(L);
B.Generated(BRepBuilderAPI_MakeFace(P));

4
src/TDataXtd/TDataXtd_Point.cxx
View File

@ -29,8 +29,6 @@
#include <BRep_Tool.hxx>
#define OCC2932
//=======================================================================
//function : GetID
//purpose :
@ -67,7 +65,6 @@ Handle(TDataXtd_Point) TDataXtd_Point::Set (const TDF_Label& L, const gp_Pnt& P)
{
Handle(TDataXtd_Point) A = Set (L);
#ifdef OCC2932
Handle(TNaming_NamedShape) aNS;
if(L.FindAttribute(TNaming_NamedShape::GetID(), aNS)) {
if(!aNS->Get().IsNull())
@ -80,7 +77,6 @@ Handle(TDataXtd_Point) TDataXtd_Point::Set (const TDF_Label& L, const gp_Pnt& P)
return A;
}
}
#endif
TNaming_Builder B(L);
B.Generated(BRepBuilderAPI_MakeVertex(P));

3
src/TDataXtd/TDataXtd_Shape.cxx
View File

@ -24,7 +24,6 @@
#include <TNaming_Tool.hxx>
#include <TNaming.hxx>
#define OCC2932
//=======================================================================
//function : Find
//purpose :
@ -78,14 +77,12 @@ Handle(TDataXtd_Shape) TDataXtd_Shape::Set (const TDF_Label& label, const TopoDS
A = TDataXtd_Shape::New (label);
}
#ifdef OCC2932
Handle(TNaming_NamedShape) aNS;
if(label.FindAttribute(TNaming_NamedShape::GetID(), aNS)) {
if(!aNS->Get().IsNull())
if(aNS->Get() == shape)
return A;
}
#endif
TNaming_Builder B(label);
B.Generated(shape);

20
src/TDocStd/TDocStd_Application.cxx
View File

@ -30,15 +30,9 @@
#include <CDM_MessageDriver.hxx>
// The improvement concerns returning value of the methods Open(), Save() and SaveAs():
#define BUC60867
// TDocStd_Owner attribute have pointer of closed TDocStd_Document
#define OCC159
#ifdef OCC159
#include <TDocStd_Owner.hxx>
#endif
//=======================================================================
//function : TDocStd_Application
@ -144,7 +138,6 @@ void TDocStd_Application::InitDocument(const Handle(TDocStd_Document)& /*aDoc*/)
{
}
#ifdef OCC159
//=======================================================================
//function : Close
//purpose :
@ -165,7 +158,6 @@ void TDocStd_Application::Close(const Handle(TDocStd_Document)& aDoc)
aDoc->BeforeClose();
CDF_Application::Close(aDoc);
}
#endif
//=======================================================================
//function : IsInSession
@ -208,10 +200,8 @@ PCDM_ReaderStatus TDocStd_Application::Open(const TCollection_ExtendedString& pa
TCollection_ExtendedString file = tool.Name();
file+=".";
file+=tool.Extension();
#ifdef BUC60867
status = CanRetrieve(directory,file);
if (status != PCDM_RS_OK) return status;
#endif
try {
OCC_CATCH_SIGNALS
Handle(TDocStd_Document) D =
@ -250,7 +240,6 @@ PCDM_StoreStatus TDocStd_Application::SaveAs(const Handle(TDocStd_Document)& D,c
file+=tool.Extension();
D->Open(this);
CDF_Store storer (D);
#ifdef BUC60867
if (!storer.SetFolder(directory))
{
TCollection_ExtendedString aMsg ("TDocStd_Application::SaveAs() - folder ");
@ -260,7 +249,6 @@ PCDM_StoreStatus TDocStd_Application::SaveAs(const Handle(TDocStd_Document)& D,c
MessageDriver()->Write(aMsg.ToExtString());
return storer.StoreStatus(); //CDF_SS_Failure;
}
#endif
storer.SetName (file);
try {
OCC_CATCH_SIGNALS
@ -275,12 +263,10 @@ PCDM_StoreStatus TDocStd_Application::SaveAs(const Handle(TDocStd_Document)& D,c
}
if(storer.StoreStatus() == PCDM_SS_OK)
D->SetSaved();
#ifdef BUC60867
#ifdef OCCT_DEBUG
cout<<"TDocStd_Application::SaveAs(): The status = "<<storer.StoreStatus()<<endl;
#endif
return storer.StoreStatus();
#endif
}
//=======================================================================
@ -289,9 +275,7 @@ PCDM_StoreStatus TDocStd_Application::SaveAs(const Handle(TDocStd_Document)& D,c
//=======================================================================
PCDM_StoreStatus TDocStd_Application::Save (const Handle(TDocStd_Document)& D) {
#ifdef BUC60867
PCDM_StoreStatus status = PCDM_SS_OK;
#endif
if (D->IsSaved()) {
CDF_Store storer (D);
try{
@ -307,9 +291,7 @@ PCDM_StoreStatus TDocStd_Application::Save (const Handle(TDocStd_Document)& D) {
}
if(storer.StoreStatus() == PCDM_SS_OK)
D->SetSaved();
#ifdef BUC60867
status = storer.StoreStatus();
#endif
} else {
if(!MessageDriver().IsNull()) {
TCollection_ExtendedString aMsg("Document has not been saved yet");
@ -317,12 +299,10 @@ PCDM_StoreStatus TDocStd_Application::Save (const Handle(TDocStd_Document)& D) {
}
status = PCDM_SS_Failure;
}
#ifdef BUC60867
#ifdef OCCT_DEBUG
cout<<"TDocStd_Application::Save(): The status = "<<status<<endl;
#endif
return status;
#endif
}
//=======================================================================

6
src/TDocStd/TDocStd_Document.cxx
View File

@ -51,8 +51,6 @@ theList.Remove(it);
#undef DEB_DELTA
#define BUC60836
#define SRN_DELTA_COMPACT
//=======================================================================
@ -576,9 +574,7 @@ Standard_Boolean TDocStd_Document::Undo()
cout<<"DF before Undo =================================="<<endl; TDF_Tool::DeepDump(cout,myData);
#endif
Handle(TDF_Delta) D = myData->Undo(myUndos.Last(),Standard_True);
#ifdef BUC60836
D->SetName(myUndos.Last()->Name());
#endif
#ifdef OCCT_DEBUG_DELTA
cout<<"DF after Undo =================================="<<endl; TDF_Tool::DeepDump(cout,myData);
#endif
@ -637,9 +633,7 @@ Standard_Boolean TDocStd_Document::Redo()
cout<<"DF before Redo =================================="<<endl; TDF_Tool::DeepDump(cout,myData);
#endif
Handle(TDF_Delta) D = myData->Undo(myRedos.First(),Standard_True);
#ifdef BUC60836
D->SetName(myRedos.First()->Name());
#endif
#ifdef OCCT_DEBUG_DELTA
cout<<"DF after Redo =================================="<<endl; TDF_Tool::DeepDump(cout,myData);
#endif

3
src/TNaming/TNaming_Localizer.cxx
View File

@ -37,7 +37,6 @@
#include <TopExp.hxx>
#include <TopExp_Explorer.hxx>
#define OCC351
#ifdef OCCT_DEBUG
//#define MDTV_DEB_SC
#ifdef OCCT_DEBUG_SC
@ -768,7 +767,6 @@ void TNaming_Localizer::FindShapeContext (const Handle(TNaming_NamedShape)& NS,
}
}
// end szy
#ifdef OCC351
if (!SC.IsNull()) {
Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(SC,Father);
if (!aNS.IsNull()) {
@ -789,7 +787,6 @@ void TNaming_Localizer::FindShapeContext (const Handle(TNaming_NamedShape)& NS,
}
}
}
#endif
}

36
src/TNaming/TNaming_Name.cxx
View File

@ -67,11 +67,7 @@
#include <TNaming_NCollections.hxx>
#define BUC60925
#define OCC352
#ifdef OCCT_DEBUG_DBGTOOLS_WRITE
//#define OCC355
#define MDTV_DEB
#define MDTV_DEB_OR
#define MDTV_DEB_UNN
@ -392,8 +388,6 @@ static TopoDS_Shape MakeShape (const TopTools_MapOfShape& MS)
return TopoDS_Shape();
}
#ifdef OCC352
//=======================================================================
//function : ShapeWithType
//purpose : Tries to make shape with given type from the given shape
@ -497,8 +491,6 @@ static TopoDS_Shape ShapeWithType(const TopoDS_Shape theShape,
return theShape;
}
#endif
//=======================================================================
//function : FindModifUntil
//purpose :
@ -613,9 +605,7 @@ static Standard_Boolean ModifUntil (const TDF_Label& L,
{
TopTools_MapOfShape MS;
TDF_LabelMap Forbiden;
#ifdef BUC60925
if(!ValidArgs(Args)) return Standard_False;
#endif
TNaming_NamingTool::BuildDescendants (Stop, Forbiden); // fills Forbidden from Stop
#ifdef OCCT_DEBUG_GEN
@ -662,9 +652,7 @@ static Standard_Boolean ConstShape (const TDF_Label& L,
{
TopTools_MapOfShape MS;
TDF_LabelMap Forbiden;
#ifdef BUC60925
if(!ValidArgs(Args)) return Standard_False;
#endif
TNaming_NamingTool::BuildDescendants (Stop, Forbiden);
TopoDS_Shape S;
@ -711,9 +699,7 @@ static Standard_Boolean Intersection (const TDF_Label& L,
const Standard_Integer Index)
{
if (Args.IsEmpty()) return Standard_False;
#ifdef BUC60925
if(!ValidArgs(Args)) return Standard_False;
#endif
TNaming_ListIteratorOfListOfNamedShape it(Args);
TopTools_MapOfShape MS;
TDF_LabelMap Forbiden;
@ -901,9 +887,7 @@ static Standard_Boolean Union (const TDF_Label& L,
const TDF_Label& ContextLabel)
{
if (Args.IsEmpty()) return Standard_False;
#ifdef BUC60925
if(!ValidArgs(Args)) return Standard_False;
#endif
// temporary solution for Orientation name
Standard_Boolean isOr(Standard_True);
/* not completed
@ -1043,7 +1027,6 @@ static Standard_Boolean Union (const TDF_Label& L,
else cout << "UNION: Shape is NOT found in Context" <<endl;
}
#endif
#ifdef OCC352
if(found)
B.Select(aCand, aCand);
else {
@ -1065,15 +1048,6 @@ static Standard_Boolean Union (const TDF_Label& L,
#endif
B.Select(aShape,aShape);
}
#else
for (TopTools_MapIteratorOfMapOfShape itM(S.Map()); itM.More(); itM.Next()) {
const TopoDS_Shape& S = itM.Key();
B.Select(S,S);
}
#endif
return Standard_True;
}
@ -1135,9 +1109,7 @@ static Standard_Boolean Generated (const TDF_Label& L,
// First argument : label of generation
// Next arguments : generators.
#ifdef BUC60925
if(!ValidArgs(Args)) return Standard_False;
#endif
TDF_Label LabelOfGeneration = Args.First()->Label();
#ifdef OCCT_DEBUG_GEN
@ -1341,9 +1313,7 @@ static Standard_Boolean Identity (const TDF_Label& L,
if (Args.Extent() > 2) {
Standard_ConstructionError::Raise("TNaming_Name::Solve");
}
#ifdef BUC60925
if(!ValidArgs(Args)) return Standard_False;
#endif
const Handle(TNaming_NamedShape)& A = Args.First();
TopTools_MapOfShape MS;
TDF_LabelMap Forbiden;
@ -1355,11 +1325,7 @@ static Standard_Boolean Identity (const TDF_Label& L,
#endif
TNaming_Builder B(L);
for (TopTools_MapIteratorOfMapOfShape itM(MS); itM.More(); itM.Next()) {
#ifdef OCC352
const TopoDS_Shape& S = ShapeWithType(itM.Key(),ShapeType);
#else
const TopoDS_Shape& S = itM.Key();
#endif
#ifdef OCCT_DEBUG_SOL2
//TopAbs_Orientation Or = S.Orientation();
#endif
@ -1386,9 +1352,7 @@ static Standard_Boolean FilterByNeighbourgs (const TDF_Label& L,
TNaming_Builder B(L);
TDF_LabelMap Forbiden;
#ifdef BUC60925
if(!ValidArgs(Args)) return Standard_False;
#endif
TNaming_NamingTool::BuildDescendants (Stop, Forbiden); //all descendants of Stop (New shapes) are forbidden
if (!Stop.IsNull()) Forbiden.Remove(Stop->Label());
//----------------------------------------

Some files were not shown because too many files have changed in this diff Show More