From 63c629aa3ac44c1036302a58ce04333db7072b90 Mon Sep 17 00:00:00 2001 From: dbv Date: Wed, 8 Oct 2014 19:00:20 +0400 Subject: [PATCH] 0025266: Debug statements in the source are getting flushed on to the console Output to cout activated previously in Debug mode by #ifdef DEB is suppressed by using macro _DEB instead of DEB --- src/AIS/AIS_InteractiveContext.cxx | 22 +-- src/AIS/AIS_InteractiveContext_1.cxx | 10 +- src/AIS/AIS_InteractiveContext_2.cxx | 4 +- src/AIS/AIS_InteractiveObject.cxx | 2 +- src/AIS/AIS_LocalContext_1.cxx | 4 +- src/AIS/AIS_Shape.cxx | 10 +- src/AIS/AIS_TexturedShape.cxx | 6 + src/AdvApp2Var/AdvApp2Var_Context.cxx | 2 +- src/AppBlend/AppBlend_AppSurf.gxx | 10 +- src/Approx/Approx_CurvilinearParameter.cxx | 2 +- src/Approx/Approx_SameParameter.cxx | 10 +- src/BRepAlgo/BRepAlgo_BooleanOperation.cxx | 2 +- src/BRepAlgo/BRepAlgo_DSAccess.cxx | 2 +- src/BRepAlgo/BRepAlgo_NormalProjection.cxx | 12 +- src/BRepAlgo/BRepAlgo_Tool.cxx | 2 +- src/BRepBlend/BRepBlend_AppFuncRoot.cxx | 4 +- src/BRepBlend/BRepBlend_SurfRstConstRad.cxx | 2 +- src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx | 2 +- .../BRepBlend_SurfRstLineBuilder.cxx | 14 +- src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx | 26 +-- src/BRepCheck/BRepCheck_Analyzer.cxx | 12 +- src/BRepCheck/BRepCheck_Wire.cxx | 2 +- src/BRepClass3d/BRepClass3d_SClassifier.cxx | 2 +- src/BRepClass3d/BRepClass3d_SolidExplorer.cxx | 4 +- src/BRepFeat/BRepFeat_MakeDPrism.cxx | 2 +- src/BRepFeat/BRepFeat_MakeLinearForm.cxx | 27 ++- src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx | 29 ++-- src/BRepFeat/BRepFeat_RibSlot.cxx | 4 +- src/BRepFill/BRepFill.cxx | 2 +- src/BRepFill/BRepFill_Draft.cxx | 6 +- src/BRepFill/BRepFill_LocationLaw.cxx | 4 +- src/BRepFill/BRepFill_MultiLine.cxx | 6 +- src/BRepFill/BRepFill_OffsetWire.cxx | 2 + src/BRepFill/BRepFill_ShapeLaw.cxx | 2 +- src/BRepFill/BRepFill_Sweep.cxx | 12 +- src/BRepFill/BRepFill_TrimEdgeTool.cxx | 18 +- src/BRepFill/BRepFill_TrimSurfaceTool.cxx | 9 +- src/BRepLib/BRepLib_FuseEdges.cxx | 33 +--- src/BRepLib/BRepLib_MakeWire.cxx | 6 +- src/BRepOffset/BRepOffset_Analyse.cxx | 4 +- src/BRepOffset/BRepOffset_Inter2d.cxx | 16 +- src/BRepOffset/BRepOffset_MakeOffset.cxx | 4 +- src/BRepOffset/BRepOffset_Offset.cxx | 4 +- src/BRepOffset/BRepOffset_Tool.cxx | 8 +- .../BRepOffsetAPI_MakeOffset.cxx | 2 + src/BRepTools/BRepTools_ReShape.cxx | 2 +- .../BRepTopAdaptor_FClass2d.cxx | 4 +- src/BRepTopAdaptor/BRepTopAdaptor_Tool.cxx | 4 + src/BSplCLib/BSplCLib.cxx | 2 +- src/BiTgte/BiTgte_Blend.cxx | 30 ++-- src/BinDrivers/BinDrivers.cxx | 4 + src/BinLDrivers/BinLDrivers.cxx | 4 + .../BinLDrivers_DocumentStorageDriver.cxx | 4 +- .../BinMDataStd_ByteArrayDriver.cxx | 10 +- .../BinMDataStd_ExtStringArrayDriver.cxx | 6 - .../BinMDataStd_IntPackedMapDriver.cxx | 4 +- .../BinMDataStd_IntegerArrayDriver.cxx | 5 +- .../BinMDataStd_RealArrayDriver.cxx | 4 +- src/BinMNaming/BinMNaming_NamingDriver.cxx | 9 +- .../BinMXCAFDoc_LocationDriver.cxx | 2 +- src/BinTObjDrivers/BinTObjDrivers.cxx | 4 + src/BinTools/BinTools_Curve2dSet.cxx | 7 +- src/BinTools/BinTools_CurveSet.cxx | 2 +- src/BinTools/BinTools_ShapeSet.cxx | 13 +- src/BinTools/BinTools_SurfaceSet.cxx | 18 +- src/BinXCAFDrivers/BinXCAFDrivers.cxx | 4 + src/Blend/Blend_Walking_1.gxx | 10 -- src/Blend/Blend_Walking_3.gxx | 2 +- src/Blend/Blend_Walking_4.gxx | 4 +- src/BlendFunc/BlendFunc_CSCircular.cxx | 12 -- src/BlendFunc/BlendFunc_ConstRad.cxx | 23 +-- src/BlendFunc/BlendFunc_ConstRadInv.cxx | 14 +- src/BlendFunc/BlendFunc_EvolRad.cxx | 20 +-- src/BlendFunc/BlendFunc_EvolRadInv.cxx | 12 -- src/CSLib/CSLib_Class2d.cxx | 2 + src/ChFi3d/ChFi3d.cxx | 2 +- src/ChFi3d/ChFi3d_Builder.cxx | 24 +-- src/ChFi3d/ChFi3d_Builder_1.cxx | 6 +- src/ChFi3d/ChFi3d_Builder_2.cxx | 22 +-- src/ChFi3d/ChFi3d_Builder_6.cxx | 114 ++++++------ src/ChFi3d/ChFi3d_Builder_C1.cxx | 6 +- src/ChFi3d/ChFi3d_Builder_C2.cxx | 24 +-- src/ChFi3d/ChFi3d_Builder_CnCrn.cxx | 4 +- src/ChFi3d/ChFi3d_Builder_SpKP.cxx | 16 +- src/ChFi3d/ChFi3d_ChBuilder_C3.cxx | 2 +- src/ChFi3d/ChFi3d_FilBuilder.cxx | 2 +- src/ChFi3d/ChFi3d_FilBuilder_C3.cxx | 6 +- src/ChFiDS/ChFiDS_Spine.cxx | 10 +- .../ChFiKPart_ComputeData_ChAsymPlnCon.cxx | 8 +- .../ChFiKPart_ComputeData_ChAsymPlnCyl.cxx | 4 + .../ChFiKPart_ComputeData_ChPlnCyl.cxx | 2 + .../ChFiKPart_ComputeData_FilPlnCon.cxx | 2 + .../ChFiKPart_ComputeData_FilPlnCyl.cxx | 4 +- .../ChFiKPart_ComputeData_Sphere.cxx | 2 +- src/DBRep/DBRep.cxx | 4 +- src/DBRep/DBRep_IsoBuilder.cxx | 14 +- src/DDF/DDF_BrowserCommands.cxx | 2 +- src/DDF/DDF_IOStream.cxx | 4 +- src/DDataStd/DDataStd_BasicCommands.cxx | 2 +- src/DNaming/DNaming.cxx | 12 +- .../DNaming_BooleanOperationDriver.cxx | 10 +- src/DNaming/DNaming_CylinderDriver.cxx | 8 +- src/DNaming/DNaming_FilletDriver.cxx | 8 +- src/DNaming/DNaming_ModelingCommands.cxx | 26 +-- src/DNaming/DNaming_PointDriver.cxx | 2 +- src/DNaming/DNaming_SphereDriver.cxx | 4 +- src/DNaming/DNaming_TransformationDriver.cxx | 4 +- src/DPrsStd/DPrsStd.cxx | 2 +- .../DPrsStd_AISPresentationCommands.cxx | 6 +- src/Draft/Draft_Modification_1.cxx | 18 +- src/Draw/Draw.cxx | 2 +- src/Draw/Draw_Interpretor.cxx | 2 +- src/Draw/Draw_PloadCommands.cxx | 16 +- src/DrawDim/DrawDim_PlanarDiameter.cxx | 2 + src/DrawDim/DrawDim_PlanarDistance.cxx | 2 + src/DrawDim/DrawDim_PlanarRadius.cxx | 2 + src/DrawDim/DrawDim_Radius.cxx | 3 +- src/FEmTool/FEmTool_Assembly.cxx | 2 +- src/FSD/FSD_CmpFile.cxx | 4 + src/Font/Font_FTFont.cxx | 2 +- src/GeomFill/GeomFill_ConstrainedFilling.cxx | 10 +- src/GeomFill/GeomFill_CorrectedFrenet.cxx | 4 +- src/GeomFill/GeomFill_Darboux.cxx | 2 +- src/GeomFill/GeomFill_Frenet.cxx | 6 +- src/GeomFill/GeomFill_GuideTrihedronAC.cxx | 2 +- src/GeomFill/GeomFill_GuideTrihedronPlan.cxx | 10 +- src/GeomFill/GeomFill_LocationGuide.cxx | 24 +-- src/GeomFill/GeomFill_NSections.cxx | 10 +- src/GeomFill/GeomFill_Pipe.cxx | 4 +- src/GeomFill/GeomFill_SectionPlacement.cxx | 2 +- src/GeomFill/GeomFill_Sweep.cxx | 6 +- .../GeomFill_SweepSectionGenerator.cxx | 2 + src/GeomLib/GeomLib.cxx | 4 +- src/GeomToIGES/GeomToIGES_GeomCurve.cxx | 4 +- .../GeomToStep_MakeBoundedCurve.cxx | 2 +- src/GeomToStep/GeomToStep_MakeConic.cxx | 4 +- src/GeomToStep/GeomToStep_MakeCurve.cxx | 6 +- src/GeomToStep/GeomToStep_MakeSurface.cxx | 2 +- src/GeomTools/GeomTools_Curve2dSet.cxx | 2 +- src/GeomTools/GeomTools_CurveSet.cxx | 2 +- src/GeomTools/GeomTools_SurfaceSet.cxx | 2 +- .../GeomliteTest_API2dCommands.cxx | 2 + .../GeomliteTest_ApproxCommands.cxx | 4 +- src/Graphic3d/Graphic3d_TextureRoot.cxx | 4 + src/HLRBRep/HLRBRep_Data.cxx | 22 ++- src/HLRBRep/HLRBRep_PolyAlgo.cxx | 26 +-- src/IFSelect/IFSelect_Activator.cxx | 2 +- src/IGESCAFControl/IGESCAFControl_Reader.cxx | 2 +- src/IGESCAFControl/IGESCAFControl_Writer.cxx | 5 +- src/IGESControl/IGESControl_IGESBoundary.cxx | 10 +- src/IGESControl/IGESControl_Writer.cxx | 8 +- src/IGESData/IGESData_ReadWriteModule.cxx | 2 +- src/IGESSelect/IGESSelect_SplineToBSpline.cxx | 2 +- src/IGESToBRep/IGESToBRep.cxx | 4 +- src/IGESToBRep/IGESToBRep_BasicCurve.cxx | 6 +- src/IGESToBRep/IGESToBRep_BasicSurface.cxx | 2 +- src/IGESToBRep/IGESToBRep_TopoSurface.cxx | 6 +- src/Image/Image_AlienPixMap.cxx | 4 + src/Image/Image_Diff.cxx | 8 + src/IntCurveSurface/IntCurveSurface_Inter.gxx | 4 +- .../IntCurveSurface_Polygon.gxx | 4 + src/IntPatch/IntPatch_LineConstructor.cxx | 11 +- src/IntPatch/IntPatch_RstInt.cxx | 5 - src/IntWalk/IntWalk_IWalking_2.gxx | 2 +- src/Interface/Interface_Static.cxx | 6 +- src/LDOM/LDOM_MemManager.cxx | 2 +- src/LocOpe/LocOpe_BuildShape.cxx | 2 +- src/LocOpe/LocOpe_FindEdges.cxx | 8 +- src/LocOpe/LocOpe_SplitDrafts.cxx | 2 +- src/LocOpe/LocOpe_SplitShape.cxx | 6 +- src/LocOpe/LocOpe_Spliter.cxx | 2 +- src/MDF/MDF_Tool.cxx | 6 +- src/MDocStd/MDocStd.cxx | 4 +- ...MPrsStd_AISPresentationRetrievalDriver.cxx | 2 +- ...rsStd_AISPresentationRetrievalDriver_1.cxx | 2 +- .../MPrsStd_AISPresentationStorageDriver.cxx | 2 +- src/MeshTest/MeshTest_CheckTopology.cxx | 4 +- src/Message/Message_PrinterOStream.cxx | 2 + src/MgtGeom/MgtGeom.cxx | 8 + src/MgtGeom2d/MgtGeom2d.cxx | 4 + src/OSD/OSD_File.cxx | 2 + src/OSD/OSD_FileIterator.cxx | 2 +- src/OSD/OSD_Path.cxx | 2 +- src/OSD/OSD_signal.cxx | 16 ++ src/OpenGl/OpenGl_Context.cxx | 2 + src/OpenGl/OpenGl_telem_util.cxx | 4 +- src/Poly/Poly.cxx | 6 + src/ProjLib/ProjLib_CompProjectedCurve.cxx | 4 +- .../ProjLib_ComputeApproxOnPolarSurface.cxx | 2 +- .../QANewBRepNaming_BooleanOperationFeat.cxx | 12 +- src/QANewBRepNaming/QANewBRepNaming_Cut.cxx | 4 +- .../QANewBRepNaming_Cylinder.cxx | 2 +- .../QANewBRepNaming_Fillet.cxx | 2 +- .../QANewModTopOpe_Glue_shell.cxx | 2 +- .../RWStepAP214_ReadWriteModule.cxx | 4 +- src/RWStepShape/RWStepShape_RWEdgeCurve.cxx | 16 +- src/RWStepShape/RWStepShape_RWFaceBound.cxx | 8 +- src/RWStl/RWStl.cxx | 6 +- src/STEPCAFControl/STEPCAFControl_Reader.cxx | 28 +-- src/STEPCAFControl/STEPCAFControl_Writer.cxx | 37 ++-- src/STEPConstruct/STEPConstruct.cxx | 4 +- src/STEPConstruct/STEPConstruct_Assembly.cxx | 4 +- .../STEPConstruct_ExternRefs.cxx | 8 - src/STEPConstruct/STEPConstruct_Styles.cxx | 12 +- .../STEPConstruct_UnitContext.cxx | 16 +- .../STEPConstruct_ValidationProps.cxx | 26 +-- src/STEPControl/STEPControl_ActorRead.cxx | 16 +- src/STEPControl/STEPControl_ActorWrite.cxx | 16 +- src/STEPControl/STEPControl_Reader.cxx | 2 +- src/ShapeAnalysis/ShapeAnalysis_Curve.cxx | 22 +-- src/ShapeAnalysis/ShapeAnalysis_Surface.cxx | 12 +- src/ShapeBuild/ShapeBuild_Edge.cxx | 6 +- src/ShapeConstruct/ShapeConstruct.cxx | 12 +- src/ShapeConstruct/ShapeConstruct_Curve.cxx | 12 +- .../ShapeConstruct_ProjectCurveOnSurface.cxx | 38 ++-- .../ShapeCustom_BSplineRestriction.cxx | 26 ++- src/ShapeCustom/ShapeCustom_Curve.cxx | 2 +- src/ShapeCustom/ShapeCustom_Surface.cxx | 6 +- src/ShapeExtend/ShapeExtend_ComplexCurve.cxx | 2 +- .../ShapeExtend_CompositeSurface.cxx | 4 +- .../ShapeExtend_MsgRegistrator.cxx | 4 +- src/ShapeFix/ShapeFix.cxx | 4 +- src/ShapeFix/ShapeFix_ComposeShell.cxx | 36 ++-- src/ShapeFix/ShapeFix_Edge.cxx | 11 +- src/ShapeFix/ShapeFix_EdgeProjAux.cxx | 20 +-- src/ShapeFix/ShapeFix_Face.cxx | 22 +-- src/ShapeFix/ShapeFix_FaceConnect.cxx | 14 +- src/ShapeFix/ShapeFix_FixSmallFace.cxx | 2 +- src/ShapeFix/ShapeFix_Solid.cxx | 6 +- src/ShapeFix/ShapeFix_Wire.cxx | 30 ++-- src/ShapeFix/ShapeFix_WireSegment.cxx | 10 +- src/ShapeFix/ShapeFix_Wire_1.cxx | 8 +- src/ShapeFix/ShapeFix_Wireframe.cxx | 2 +- src/ShapeProcess/ShapeProcess.cxx | 6 +- src/ShapeProcess/ShapeProcess_Context.cxx | 16 +- src/ShapeProcess/ShapeProcess_OperLibrary.cxx | 10 +- .../ShapeUpgrade_ClosedFaceDivide.cxx | 4 +- .../ShapeUpgrade_ConvertCurve2dToBezier.cxx | 4 +- .../ShapeUpgrade_ConvertCurve3dToBezier.cxx | 4 +- ...apeUpgrade_ConvertSurfaceToBezierBasis.cxx | 4 +- .../ShapeUpgrade_FixSmallBezierCurves.cxx | 6 +- src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx | 2 +- .../ShapeUpgrade_SplitCurve2d.cxx | 8 +- .../ShapeUpgrade_SplitCurve2dContinuity.cxx | 2 +- .../ShapeUpgrade_SplitCurve3d.cxx | 10 +- .../ShapeUpgrade_SplitCurve3dContinuity.cxx | 2 +- .../ShapeUpgrade_SplitSurface.cxx | 2 +- .../ShapeUpgrade_SplitSurfaceContinuity.cxx | 2 +- .../ShapeUpgrade_UnifySameDomain.cxx | 8 +- src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx | 4 +- src/Standard/Standard_Real.cxx | 8 + src/StdDrivers/StdDrivers.cxx | 8 +- src/StdLDrivers/StdLDrivers.cxx | 6 +- .../StdPrs_WFDeflectionRestrictedFace.cxx | 4 + src/StdSelect/StdSelect_BRepSelectionTool.cxx | 2 +- src/StepAP209/StepAP209_Construct.cxx | 4 +- src/StepBasic/StepBasic_SiUnit.cxx | 2 +- src/StepData/StepData_StepWriter.cxx | 2 +- .../StepToGeom_MakeBSplineCurve.pxx | 5 +- .../StepToGeom_MakeBoundedCurve.cxx | 12 -- .../StepToGeom_MakeBoundedSurface.cxx | 12 -- src/StepToGeom/StepToGeom_MakeSurface.cxx | 5 +- .../StepToGeom_MakeTrimmedCurve.cxx | 3 - .../StepToGeom_MakeTrimmedCurve2d.cxx | 3 - .../StepToTopoDS_GeometricTool.cxx | 18 +- .../StepToTopoDS_TranslateCompositeCurve.cxx | 4 +- .../StepToTopoDS_TranslateEdge.cxx | 4 +- .../StepToTopoDS_TranslateEdgeLoop.cxx | 6 +- .../StepToTopoDS_TranslateFace.cxx | 4 +- .../StepToTopoDS_TranslateShell.cxx | 2 +- src/StlTransfer/StlTransfer.cxx | 2 +- src/Storage/Storage_Schema.cxx | 8 + src/TDF/TDF_CopyLabel.cxx | 6 +- src/TDF/TDF_Delta.cxx | 2 +- src/TDF/TDF_DeltaOnForget.cxx | 2 +- src/TDF/TDF_DeltaOnResume.cxx | 2 +- ...DataStd_DeltaOnModificationOfByteArray.cxx | 10 +- ...td_DeltaOnModificationOfExtStringArray.cxx | 12 +- ...TDataStd_DeltaOnModificationOfIntArray.cxx | 12 +- ...aStd_DeltaOnModificationOfIntPackedMap.cxx | 4 +- ...DataStd_DeltaOnModificationOfRealArray.cxx | 12 +- src/TDocStd/TDocStd_Application.cxx | 6 +- .../TDocStd_MultiTransactionManager.cxx | 2 +- src/TNaming/TNaming.cxx | 2 +- src/TNaming/TNaming_Identifier.cxx | 2 +- src/TNaming/TNaming_Localizer.cxx | 14 +- src/TNaming/TNaming_Name.cxx | 4 +- src/TNaming/TNaming_NamedShape.cxx | 2 +- src/TNaming/TNaming_Naming.cxx | 4 +- src/TPrsStd/TPrsStd_ConstraintTools.cxx | 160 ++++++++--------- src/TPrsStd/TPrsStd_DriverTable.cxx | 2 +- src/TestTopOpe/TestTopOpe.cxx | 2 +- src/TestTopOpe/TestTopOpe_HDSDisplayer.cxx | 2 +- src/TopClass/TopClass_Classifier3d.gxx | 10 +- src/TopClass/TopClass_SolidClassifier.gxx | 4 +- src/TopCnx/TopCnx_EdgeFaceTransition.cxx | 6 + src/TopOpeBRep/TopOpeBRep_DSFiller.cxx | 6 +- src/TopOpeBRep/TopOpeBRep_EdgesFiller.cxx | 6 +- src/TopOpeBRep/TopOpeBRep_FacesFiller.cxx | 4 +- src/TopOpeBRep/TopOpeBRep_FacesFiller_1.cxx | 4 +- .../TopOpeBRep_FacesIntersector.cxx | 4 +- .../TopOpeBRep_ShapeIntersector.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_End.cxx | 2 +- .../TopOpeBRepBuild_GridEE.cxx | 4 +- .../TopOpeBRepBuild_GridFF.cxx | 4 +- .../TopOpeBRepBuild_HBuilder.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_KPart.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_Merge.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.cxx | 2 +- src/TopOpeBRepBuild/TopOpeBRepBuild_Tools.cxx | 2 +- .../TopOpeBRepBuild_fctwes.cxx | 2 +- .../TopOpeBRepBuild_kpkole.cxx | 2 +- .../TopOpeBRepBuild_makefaces.cxx | 6 +- src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx | 2 +- src/TopOpeBRepDS/TopOpeBRepDS_Check.cxx | 28 +-- .../TopOpeBRepDS_DataStructure.cxx | 6 +- src/TopOpeBRepDS/TopOpeBRepDS_EXPORT.cxx | 2 +- .../TopOpeBRepDS_Edge3dInterferenceTool.cxx | 2 +- .../TopOpeBRepDS_EdgeInterferenceTool.cxx | 2 +- src/TopOpeBRepDS/TopOpeBRepDS_TOOL.cxx | 2 +- .../TopOpeBRepTool_FuseEdges.cxx | 2 +- .../TopOpeBRepTool_GEOMETRY.cxx | 2 +- .../TopOpeBRepTool_HBoxTool.cxx | 2 +- .../TopOpeBRepTool_ShapeClassifier.cxx | 2 +- src/TopOpeBRepTool/TopOpeBRepTool_TOOL.cxx | 2 +- .../TopoDSToStep_MakeBrepWithVoids.cxx | 6 +- .../TopoDSToStep_MakeStepEdge.cxx | 2 +- .../TopoDSToStep_MakeStepFace.cxx | 4 +- src/TopoDSToStep/TopoDSToStep_Tool.cxx | 8 +- .../TopoDSToStep_WireframeBuilder.cxx | 6 +- src/Units/Units.cxx | 8 + src/Units/Units_Explorer.cxx | 4 + src/Units/Units_Lexicon.cxx | 2 + src/Units/Units_Measurement.cxx | 4 + src/Units/Units_Sentence.cxx | 4 +- src/Units/Units_Token.cxx | 2 +- src/Units/Units_UnitsDictionary.cxx | 14 +- src/Units/Units_UnitsSystem.cxx | 2 + src/UnitsAPI/UnitsAPI.cxx | 22 +++ src/UnitsMethods/UnitsMethods.cxx | 12 +- src/ViewerTest/ViewerTest.cxx | 4 +- src/Visual3d/Visual3d_Layer.cxx | 8 +- src/XCAFDoc/XCAFDoc_ShapeTool.cxx | 2 + src/XCAFDrivers/XCAFDrivers.cxx | 6 + src/XCAFPrs/XCAFPrs.cxx | 2 +- src/XSAlgo/XSAlgo_AlgoContainer.cxx | 10 +- src/XmlDrivers/XmlDrivers.cxx | 4 + .../XmlDrivers_DocumentRetrievalDriver.cxx | 3 - src/XmlLDrivers/XmlLDrivers.cxx | 12 ++ .../XmlLDrivers_DocumentRetrievalDriver.cxx | 3 - .../XmlLDrivers_DocumentStorageDriver.cxx | 2 +- src/XmlMDF/XmlMDF.cxx | 4 +- .../XmlMDataStd_ByteArrayDriver.cxx | 5 +- .../XmlMDataStd_ExtStringArrayDriver.cxx | 5 +- .../XmlMDataStd_IntPackedMapDriver.cxx | 6 +- .../XmlMDataStd_IntegerArrayDriver.cxx | 5 +- .../XmlMDataStd_NamedDataDriver.cxx | 11 -- .../XmlMDataStd_RealArrayDriver.cxx | 5 +- src/XmlMNaming/XmlMNaming_NamingDriver.cxx | 11 +- .../XmlMXCAFDoc_LocationDriver.cxx | 2 +- src/XmlTObjDrivers/XmlTObjDrivers.cxx | 4 + src/XmlXCAFDrivers/XmlXCAFDrivers.cxx | 4 + src/math/math_FunctionRoots.cxx | 2 +- tests/bugs/fclasses/bug24533 | 22 +-- tests/bugs/modalg_5/bug23884 | 42 ++--- tests/bugs/modalg_5/bug24612 | 164 +++++++++--------- tests/bugs/vis/bug137_4 | 106 +++++------ tests/bugs/vis/bug137_5 | 106 +++++------ tests/bugs/vis/bug24901 | 56 +++--- tests/bugs/vis/bug25229 | 20 +-- 370 files changed, 1634 insertions(+), 1639 deletions(-) diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx index 8dc78cea55..b71d12d9b3 100644 --- a/src/AIS/AIS_InteractiveContext.cxx +++ b/src/AIS/AIS_InteractiveContext.cxx @@ -215,7 +215,7 @@ Standard_CString AIS_InteractiveContext::DomainOfMainViewer() const void AIS_InteractiveContext::DisplayedObjects(AIS_ListOfInteractive& aListOfIO, const Standard_Boolean OnlyFromNeutral) const { -#ifdef DEBUG +#ifdef AIS_DEB cout<<"AIS_IC::DisplayedObjects"<GraphicStatus()==AIS_DS_Displayed) theMap.Add(It.Key()); } -#ifdef DEBUG +#ifdef AIS_DEB cout<<"\tFrom Neutral Point : "<SetRecomputeOk(); -#ifdef DEB +#ifdef AIS_DEB cout<<"nb of modes to recalculate : "<SetRecomputeOk(); -#ifdef DEB +#ifdef AIS_DEB cout<<"nb of modes to recalculate : "<SetRecomputeOk(); -#ifdef DEB +#ifdef AIS_DEB cout<<"nb of modes to recalculate : "<SetRecomputeOk(); -#ifdef DEB +#ifdef AIS_DEB cout<<"nb of modes to recalculate : "<SetRecomputeOk(); -#ifdef DEB +#ifdef AIS_DEB cout<<"nb of modes to recalculate : "<SetRecomputeOk(); -#ifdef DEB +#ifdef AIS_DEB cout<<"nb of modes to recalculate : "<Update(ITI.Value(),Standard_False); NbDisp++; } -#ifdef DEB +#ifdef AIS_DEB cout<<"nb of modes to recalculate : "<SetRecomputeOk(); @@ -2044,7 +2044,7 @@ void AIS_InteractiveContext::SetWidth(const Handle(AIS_InteractiveObject)& anIOb anIObj->Update(ITI.Value(),Standard_False); NbDisp++; } -#ifdef DEB +#ifdef AIS_DEB cout<<"nb of modes to recalculate : "<SetRecomputeOk(); diff --git a/src/AIS/AIS_InteractiveContext_1.cxx b/src/AIS/AIS_InteractiveContext_1.cxx index 79b3463ef5..d77ff1b1d2 100644 --- a/src/AIS/AIS_InteractiveContext_1.cxx +++ b/src/AIS/AIS_InteractiveContext_1.cxx @@ -653,7 +653,7 @@ void AIS_InteractiveContext::SetCurrentObject(const Handle(AIS_InteractiveObject UpdateCurrentViewer(); } else{ -#ifdef DEB +#ifdef AIS_DEB cout<<"Nothing Done : Opened Local Context"<MainSelector()->UpdateConversion(); -#ifdef DEB +#ifdef AIS_DEB cout<<"\tOpen Local Context No "< Precision::Angular()) && isOwnHLRDeviationAngle) || ((Abs (newcoeff - prevcoeff) > Precision::Confusion()) && isOwnHLRDeviationCoefficient)) { -#ifdef DEB +#ifdef AIS_DEB cout << "AIS_Shape : compute"<SetTextureMap (myTexture); if (!myTexture->IsDone()) { +#ifdef AIS_DEB std::cout << "An error occurred while building texture\n"; +#endif myAspect->SetTextureMapOff(); return; } @@ -468,7 +472,9 @@ void AIS_TexturedShape::Compute (const Handle(PrsMgr_PresentationManager3d)& /*t } catch (Standard_Failure) { +#ifdef AIS_DEB std::cout << "AIS_TexturedShape::Compute() in ShadingMode failed \n"; +#endif StdPrs_WFShape::Add (thePrs, myshape, myDrawer); } break; diff --git a/src/AdvApp2Var/AdvApp2Var_Context.cxx b/src/AdvApp2Var/AdvApp2Var_Context.cxx index 3047394ac5..17cb017eae 100644 --- a/src/AdvApp2Var/AdvApp2Var_Context.cxx +++ b/src/AdvApp2Var/AdvApp2Var_Context.cxx @@ -44,7 +44,7 @@ static Standard_Boolean lesparam(const Standard_Integer iordre, // else if (*ndgjac < 61) { nbpnt = 61;} Bug Uneven number else { nbpnts = 50; -#if DEB +#if ADVAPP2VAR_DEB cout << "F(U, V) : Not enough points of discretization" << endl; #endif } diff --git a/src/AppBlend/AppBlend_AppSurf.gxx b/src/AppBlend/AppBlend_AppSurf.gxx index 56700b5972..3b9e951ea6 100644 --- a/src/AppBlend/AppBlend_AppSurf.gxx +++ b/src/AppBlend/AppBlend_AppSurf.gxx @@ -399,7 +399,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin, mytol3d = Max(TheTol3d, mytol3d); mytol2d = Max(TheTol2d, mytol2d); } -#ifdef DEB +#ifdef APPBLEND_DEB cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " --> 2d : "<< mytol2d << endl; #endif @@ -444,7 +444,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin, } theapprox.Perform(multL); theapprox.Error(mytol3d,mytol2d); -#ifdef DEB +#ifdef APPBLEND_DEB cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " --> 2d : "<< mytol2d << endl; #endif @@ -506,7 +506,7 @@ void AppBlend_AppSurf::InternalPerform(const Handle(TheLine)& Lin, mytol3d = Variation.MaxError(); mytol2d = 0.; -#ifdef DEB +#ifdef APPBLEND_DEB cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " --> 2d : "<< mytol2d << endl; #endif @@ -826,7 +826,7 @@ void AppBlend_AppSurf::Perform(const Handle(TheLine)& Lin, } // modified by EAP Thu Jan 3 15:45:27 2002 ___END___ } -#ifdef DEB +#ifdef APPBLEND_DEB cout << " Tolerances obtenues --> 3d : "<< mytol3d << endl; cout << " --> 2d : "<< mytol2d << endl; #endif @@ -851,7 +851,7 @@ void AppBlend_AppSurf::Perform(const Handle(TheLine)& Lin, F.Parameter(Lin->Point(Lin->NbPoints())), tabVKnots->ChangeArray1() ); -#ifdef DEB +#ifdef APPBLEND_DEB cout << "Warning: AppBlend_AppSurf::Perform(), bad length of aParamSeq: " << aParamSeq.Length() << " instead of " << tabVKnots->Length() << endl; #endif diff --git a/src/Approx/Approx_CurvilinearParameter.cxx b/src/Approx/Approx_CurvilinearParameter.cxx index 0ae1e4341e..18a7018187 100644 --- a/src/Approx/Approx_CurvilinearParameter.cxx +++ b/src/Approx/Approx_CurvilinearParameter.cxx @@ -659,7 +659,7 @@ void Approx_CurvilinearParameter::ToleranceComputation(const Handle(Adaptor2d_HC TolV = Tol / (4.*Max_dS_dv); TolW = Tol / (4.*Max_dS_dw); -#ifdef DEB +#ifdef APPROX_DEB cout << "TolV = " << TolV << endl; cout << "TolW = " << TolW << endl; #endif diff --git a/src/Approx/Approx_SameParameter.cxx b/src/Approx/Approx_SameParameter.cxx index 3589ae0fc8..d0a57bdfd8 100644 --- a/src/Approx/Approx_SameParameter.cxx +++ b/src/Approx/Approx_SameParameter.cxx @@ -563,7 +563,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance) if(!projok) { //Projector -#ifdef DEB +#ifdef APPROX_DEB // JAG cout << "Projection not done" << endl; #endif @@ -578,7 +578,7 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance) if(!extrok) { // If not already SameP and tangent to mill, abandon. mySameParameter = Standard_False; -#ifdef DEB +#ifdef APPROX_DEB cout<<"SameParameter problem : zero tangent to extremities"< take the complement iC = myHB->GetDSCurveFromSectEdge(Edge); if (!iC) { -#if DEB +#if BREPALGO_DEB cout << "Warning DSAccess: Modifications of Edge are not implemented" << endl; #endif } diff --git a/src/BRepAlgo/BRepAlgo_NormalProjection.cxx b/src/BRepAlgo/BRepAlgo_NormalProjection.cxx index ba70d09d4e..a9a93e41d5 100644 --- a/src/BRepAlgo/BRepAlgo_NormalProjection.cxx +++ b/src/BRepAlgo/BRepAlgo_NormalProjection.cxx @@ -290,7 +290,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams() for(k = 1; k <= Projector.NbCurves(); k++){ if(Projector.IsSinglePnt(k, P2d)){ -#ifdef DEBUG +#ifdef BREPALGO_DEB cout << "Projection of edge "<Splits(prj, TopAbs_IN); Iter.Initialize(LS); if(Iter.More()) { -#ifdef DEBUG +#ifdef BREPALGO_DEB cout << " BooleanOperations :" << Iter.More()<<" solutions " << endl; #endif for(; Iter.More(); Iter.Next()) { @@ -517,7 +517,7 @@ void BRepAlgo_NormalProjection::SetDefaultParams() } } else { -#ifdef DEB +#ifdef BREPALGO_DEB cout << " BooleanOperations : no solution " << endl; #endif diff --git a/src/BRepAlgo/BRepAlgo_Tool.cxx b/src/BRepAlgo/BRepAlgo_Tool.cxx index e147bf624c..9d172e000b 100644 --- a/src/BRepAlgo/BRepAlgo_Tool.cxx +++ b/src/BRepAlgo/BRepAlgo_Tool.cxx @@ -86,7 +86,7 @@ TopoDS_Shape BRepAlgo_Tool::Deboucle3D(const TopoDS_Shape& S, } if (NbSub == 0) { -#ifdef DEB +#ifdef BREPALGO_DEB cout << "No subhape in shape!" << endl; #endif SS = TopoDS_Shape(); diff --git a/src/BRepBlend/BRepBlend_AppFuncRoot.cxx b/src/BRepBlend/BRepBlend_AppFuncRoot.cxx index 5b629c9b9d..995bad311f 100644 --- a/src/BRepBlend/BRepBlend_AppFuncRoot.cxx +++ b/src/BRepBlend/BRepBlend_AppFuncRoot.cxx @@ -328,7 +328,7 @@ Standard_Boolean BRepBlend_AppFuncRoot::SearchPoint(Blend_AppFunction& Func, rsnld.Perform(Func, XInit, X1, X2); if (!rsnld.IsDone()) { -# ifdef DEB +# ifdef BREPBLEND_DEB cout << "AppFunc : RNLD Not done en t = " << Param << endl; # endif return Standard_False; @@ -340,7 +340,7 @@ Standard_Boolean BRepBlend_AppFuncRoot::SearchPoint(Blend_AppFunction& Func, // (4) Insertion of the point if the calculation seems long. if ((!Trouve)&&(rsnld.NbIterations()>3)) { -#ifdef DEB +#ifdef BREPBLEND_DEB cout << "Evaluation in t = " << Param << "given" << endl; rsnld.Dump(cout); #endif diff --git a/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx b/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx index 20cc54100a..6ff40cc179 100644 --- a/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx +++ b/src/BRepBlend/BRepBlend_SurfRstConstRad.cxx @@ -910,7 +910,7 @@ Standard_Boolean BRepBlend_SurfRstConstRad::Section norm = ncrossns.Magnitude(); if (norm < Eps) { norm = 1; // Not enough, but it is not necessary to stop -#if DEB +#if BREPBLEND_DEB cout << " SurfRstConstRad : Singular Surface " << endl; #endif } diff --git a/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx b/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx index 09f87dda49..feea45f1c4 100644 --- a/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx +++ b/src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx @@ -922,7 +922,7 @@ TColStd_Array1OfReal& DWeigths) norm = ncrossns.Magnitude(); if (norm < Eps) { norm = 1; // Not enough, but it is not necessary to stop -#if DEB +#if BREPBLEND_DEB cout << " SurfRstEvolRad : Surface single " << endl; #endif } diff --git a/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx b/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx index ff2e9a9100..28635882b9 100644 --- a/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx +++ b/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx @@ -704,7 +704,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction& Func, } else{ // Failed reframing. Leave with PointsConfondus -#if DEB +#if BREPBLEND_DEB cout<<"SurfRstLineBuilder : failed reframing"<NbPoints()>=2) { // Indicate that one stops during the processing -#if DEB +#if BREPBLEND_DEB cout<<"SurfRstLineBuilder : No advancement in the processing"< #endif @@ -1783,7 +1783,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the { const Standard_Integer aNumberOfStages = myAnalysis + myCutting + mySewing + 2; Message_ProgressSentry aPS (thePI, "Sewing", 0, aNumberOfStages, 1); -#ifdef DEB +#ifdef BREPBUILDERAPI_DEB Standard_Real t_total = 0., t_analysis = 0., t_assembling = 0., t_cutting = 0., t_merging = 0.; OSD_Chronometer chr_total, chr_local; chr_total.Reset(); @@ -1793,7 +1793,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the // face analysis if (myAnalysis) { -#if DEB +#if BREPBUILDERAPI_DEB cout << "Begin face analysis..." << endl; chr_local.Reset(); chr_local.Start(); @@ -1802,7 +1802,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the if (!aPS.More()) return; aPS.Next(); -#if DEB +#if BREPBUILDERAPI_DEB chr_local.Stop(); chr_local.Show(t_analysis); cout << "Face analysis finished after " << t_analysis << " s" << endl; @@ -1817,7 +1817,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the if (myBoundFaces.Extent()) { -#if DEB +#if BREPBUILDERAPI_DEB cout << "Begin vertices assembling..." << endl; chr_local.Reset(); chr_local.Start(); @@ -1826,14 +1826,14 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the if (!aPS.More()) return; aPS.Next(); -#if DEB +#if BREPBUILDERAPI_DEB chr_local.Stop(); chr_local.Show(t_assembling); cout << "Vertices assembling finished after " << t_assembling << " s" << endl; #endif if (myCutting) { -#if DEB +#if BREPBUILDERAPI_DEB cout << "Begin cutting..." << endl; chr_local.Reset(); chr_local.Start(); @@ -1842,13 +1842,13 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the if (!aPS.More()) return; aPS.Next(); -#if DEB +#if BREPBUILDERAPI_DEB chr_local.Stop(); chr_local.Show(t_cutting); cout << "Cutting finished after " << t_cutting << " s" << endl; #endif } -#if DEB +#if BREPBUILDERAPI_DEB cout << "Begin merging..." << endl; chr_local.Reset(); chr_local.Start(); @@ -1857,7 +1857,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the if (!aPS.More()) return; aPS.Next(); -#if DEB +#if BREPBUILDERAPI_DEB chr_local.Stop(); chr_local.Show(t_merging); cout << "Merging finished after " << t_merging << " s" << endl; @@ -1876,7 +1876,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the if (mySewing) { -#if DEB +#if BREPBUILDERAPI_DEB cout << "Creating sewed shape..." << endl; #endif // examine the multiple edges if any and process sameparameter for edges if necessary @@ -1896,7 +1896,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the mySewedShape.Nullify(); return; } -#if DEB +#if BREPBUILDERAPI_DEB cout << "Sewed shape created" << endl; #endif } @@ -1909,7 +1909,7 @@ void BRepBuilderAPI_Sewing::Perform(const Handle(Message_ProgressIndicator)& the return; } } -#if DEB +#if BREPBUILDERAPI_DEB chr_total.Stop(); chr_total.Show(t_total); cout << "Sewing finished!" << endl; diff --git a/src/BRepCheck/BRepCheck_Analyzer.cxx b/src/BRepCheck/BRepCheck_Analyzer.cxx index 80578e8285..1b0eb2499e 100644 --- a/src/BRepCheck/BRepCheck_Analyzer.cxx +++ b/src/BRepCheck/BRepCheck_Analyzer.cxx @@ -169,7 +169,7 @@ void BRepCheck_Analyzer::Perform(const TopoDS_Shape& S) } catch(Standard_Failure) { -#ifdef DEB +#ifdef BREPCHECK_DEB cout<<"BRepCheck_Analyzer : "; Standard_Failure::Caught()->Print(cout); cout<Print(cout); cout<Print(cout); cout<Print(cout); cout<Print(cout); cout<Print(cout); cout< Bon \n"); printf("--- distance Point Vertex : %10.7g (tol %10.7g)\n",distauvtxleplusproche,tolvtt); diff --git a/src/BRepClass3d/BRepClass3d_SClassifier.cxx b/src/BRepClass3d/BRepClass3d_SClassifier.cxx index 8b33d0a044..04a2d3b792 100644 --- a/src/BRepClass3d/BRepClass3d_SClassifier.cxx +++ b/src/BRepClass3d/BRepClass3d_SClassifier.cxx @@ -330,7 +330,7 @@ void BRepClass3d_SClassifier::Perform(BRepClass3d_SolidExplorer& SolidExplorer, IntCurveSurface_TransitionOnCurve tran = Intersector3d.Transition(i); if (tran == IntCurveSurface_Tangent) { -#ifdef DEB +#ifdef BREPCLASS3D_DEB cout<<"*Problem ds BRepClass3d_SClassifier.cxx"< " << par << endl; #endif return par; diff --git a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx index a9366b8480..73cb216703 100644 --- a/src/BRepFeat/BRepFeat_MakeLinearForm.cxx +++ b/src/BRepFeat/BRepFeat_MakeLinearForm.cxx @@ -399,8 +399,11 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase, if (!ProfileOK) { #ifdef DEB - cout << "Not computable" << endl; - if (trc) cout << "Face profile not computable" << endl; + if (trc) + { + cout << "Not computable" << endl; + cout << "Face profile not computable" << endl; + } #endif myStatusError = BRepFeat_NoFaceProf; NotDone(); @@ -414,7 +417,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase, Sliding = Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside); // Control if there is everything required to have the material at the proper side if(falseside == Standard_False) { -#ifdef DEB +#ifdef BREPFEAT_DEB cout << "Verify plane and wire orientation" << endl; #endif myStatusError = BRepFeat_FalseSide; @@ -733,8 +736,11 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase, if (!ProfileOK) { #ifdef DEB - cout << "Not computable" << endl; - if (trc) cout << " Face profile not computable" << endl; + if (trc) + { + cout << "Not computable" << endl; + cout << " Face profile not computable" << endl; + } #endif myStatusError = BRepFeat_NoFaceProf; NotDone(); @@ -748,7 +754,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase, Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside); // Control if there is everything required to have the material at the proper side if(falseside == Standard_False) { -#ifdef DEB +#ifdef BREPFEAT_DEB cout << "Verify plane and wire orientation" << endl; #endif myStatusError = BRepFeat_FalseSide; @@ -894,8 +900,11 @@ void BRepFeat_MakeLinearForm::Perform() if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) { #ifdef DEB - cout << "The case is not computable" << endl; - if (trc) cout << " Glued faces not empty and Until shape not null" << endl; + if (trc) + { + cout << "The case is not computable" << endl; + cout << " Glued faces not empty and Until shape not null" << endl; + } #endif myStatusError = BRepFeat_InvShape; NotDone(); @@ -1218,7 +1227,7 @@ static void SetGluedFaces(const TopTools_DataMapOfShapeListOfShape& theSlmap, for (it.Initialize(ledg); it.More(); it.Next()) { const TopTools_ListOfShape& gfac = thePrism.Shapes(it.Value()); if (gfac.Extent() != 1) { -#ifdef DEB +#ifdef BREPFEAT_DEB cout << "Pb SetGluedFace" << endl; #endif } diff --git a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx index bee84acf15..7b8a9febeb 100644 --- a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx +++ b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx @@ -526,8 +526,11 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, if (!ProfileOK) { #ifdef DEB - cout << "Not computable" << endl; - if (trc) cout << "Face profile not computable" << endl; + if (trc) + { + cout << "Not computable" << endl; + cout << "Face profile not computable" << endl; + } #endif myStatusError = BRepFeat_NoFaceProf; NotDone(); @@ -541,7 +544,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, Sliding = Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside); // Control if there is everything required to have the material at the proper side if(falseside == Standard_False) { -#ifdef DEB +#ifdef BREPFEAT_DEB cout << " Verify plane and wire orientation" << endl; #endif myStatusError = BRepFeat_FalseSide; @@ -939,7 +942,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, if(!BRepAlgo::IsValid(NewBndFace)) { -#ifdef DEB +#ifdef BREPFEAT_DEB cout << "Invalid new bounding face" << endl; #endif myStatusError = BRepFeat_InvShape; @@ -959,8 +962,11 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, if (!ProfileOK) { #ifdef DEB - cout << "Not computable" << endl; - if (trc) cout << " Face profile not computable" << endl; + if (trc) + { + cout << "Not computable" << endl; + cout << " Face profile not computable" << endl; + } #endif myStatusError = BRepFeat_NoFaceProf; NotDone(); @@ -974,7 +980,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, Propagate(SliList, Prof, myFirstPnt, myLastPnt, falseside); // Control if there is everything required to have the material at the proper side if(falseside == Standard_False) { -#ifdef DEB +#ifdef BREPFEAT_DEB cout << " Verify plane and wire orientation" << endl; #endif myStatusError = BRepFeat_FalseSide; @@ -1279,8 +1285,11 @@ void BRepFeat_MakeRevolutionForm::Perform() if(!myGluedF.IsEmpty() && !mySUntil.IsNull()) { #ifdef DEB - cout << "The case is not computable" << endl; - if (trc) cout << " Glued faces not empty and Until shape not null" << endl; + if (trc) + { + cout << "The case is not computable" << endl; + cout << " Glued faces not empty and Until shape not null" << endl; + } #endif myStatusError = BRepFeat_InvShape; NotDone(); @@ -1760,7 +1769,7 @@ static void SetGluedFaces(const TopTools_DataMapOfShapeListOfShape& theSlmap, for (it.Initialize(ledg); it.More(); it.Next()) { const TopTools_ListOfShape& gfac = thePrism.Shapes(it.Value()); if (gfac.Extent() != 1) { -#ifdef DEB +#ifdef BREPFEAT_DEB cout << "Pb SetGluedFace" << endl; #endif } diff --git a/src/BRepFeat/BRepFeat_RibSlot.cxx b/src/BRepFeat/BRepFeat_RibSlot.cxx index 5d8609cd6f..bdd75480c3 100644 --- a/src/BRepFeat/BRepFeat_RibSlot.cxx +++ b/src/BRepFeat/BRepFeat_RibSlot.cxx @@ -195,7 +195,7 @@ void BRepFeat_RibSlot::LFPerform() (!myFuse && ope != LocOpe_CUT) || (!Collage)) { theOpe = 2; -#ifdef DEB +#ifdef BREPFEAT_DEB cout << "Passage to topological operations" << endl; #endif } @@ -216,7 +216,7 @@ void BRepFeat_RibSlot::LFPerform() } else { theOpe = 2; -#ifdef DEB +#ifdef BREPFEAT_DEB cout << "Passage to topologic operation" << endl; #endif } diff --git a/src/BRepFill/BRepFill.cxx b/src/BRepFill/BRepFill.cxx index e3055c9cf5..2b7e27d32b 100644 --- a/src/BRepFill/BRepFill.cxx +++ b/src/BRepFill/BRepFill.cxx @@ -862,7 +862,7 @@ void BRepFill::SearchOrigin(TopoDS_Wire & W, } } } -#if DEB +#if BREPFILL_DEB else { cout << "BRepFill::SearchOrigine : Echec Distance" << endl; } diff --git a/src/BRepFill/BRepFill_Draft.cxx b/src/BRepFill/BRepFill_Draft.cxx index 35a90d4e9b..009d795e05 100644 --- a/src/BRepFill/BRepFill_Draft.cxx +++ b/src/BRepFill/BRepFill_Draft.cxx @@ -269,14 +269,14 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B, myWire = MW.Wire(); } else { -#if DEB +#if BREPFILL_DEB cout << "Error in MakeWire" << endl; #endif Standard_ConstructionError::Raise("BRepFill_Draft"); } } else { -#if DEB +#if BREPFILL_DEB cout << "No Free Borders !" << endl; #endif Standard_ConstructionError::Raise("BRepFill_Draft"); @@ -828,7 +828,7 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B, myShape = solid; } } -#if DEB +#if BREPFILL_DEB else cout << "Draft : No assembly !" << endl; #endif return Ok; diff --git a/src/BRepFill/BRepFill_LocationLaw.cxx b/src/BRepFill/BRepFill_LocationLaw.cxx index 5a02d83b98..3fa9a610a6 100644 --- a/src/BRepFill/BRepFill_LocationLaw.cxx +++ b/src/BRepFill/BRepFill_LocationLaw.cxx @@ -178,7 +178,7 @@ void BRepFill_LocationLaw::BiNormalIsMain() gp_Ax1 axe(gp::Origin(), cross.XYZ()); N2.Rotate(axe, alpha); -#if DEB +#if BREPFILL_DEB if (N2.Dot(T1) > 1.e-9) { cout << "Inprecision in TransformInCompatibleLaw" << endl; cout << "--- T1.R(N2) = " << N2.Dot(T1) << endl; @@ -616,7 +616,7 @@ void BRepFill_LocationLaw::CurvilinearBounds(const Standard_Integer Index, } else { W.Nullify(); -#if DEB +#if BREPFILL_DEB cout << "BRepFill_LocationLaw::D0 : Attention position out of limits" << endl; #endif diff --git a/src/BRepFill/BRepFill_MultiLine.cxx b/src/BRepFill/BRepFill_MultiLine.cxx index b3d785f490..cb47792308 100644 --- a/src/BRepFill/BRepFill_MultiLine.cxx +++ b/src/BRepFill/BRepFill_MultiLine.cxx @@ -622,7 +622,7 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U, Dist = TheU.Circle().Radius(); } else { -#ifdef DEB +#ifdef BREPFILL_DEB cout << "MultiLine : D1 = D2 and the Curve is not a circle" << endl; cout << " ---> ValueOnFace failed at parameter U = " << U << endl; #endif @@ -675,7 +675,7 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U, Geom2dInt_GInter Intersector(Cu1,Cu2,TolConf,Tol); if ( !Intersector.IsDone()) { -#ifdef DEB +#ifdef BREPFILL_DEB cout << "Intersector not done" << endl; cout << " ---> ValueonFace failed at parameter U = " << U << endl; #endif @@ -695,7 +695,7 @@ static gp_Pnt2d ValueOnFace(const Standard_Real U, VV = Alp*(VS2 - VS1) + VS1; } else { -#ifdef DEB +#ifdef BREPFILL_DEB cout << "Intersector done, but no points found" << endl; cout << " ---> ValueonFace failed at parameter U = " << U << endl; #endif diff --git a/src/BRepFill/BRepFill_OffsetWire.cxx b/src/BRepFill/BRepFill_OffsetWire.cxx index 6d3af0ed0b..1f63c8b22c 100644 --- a/src/BRepFill/BRepFill_OffsetWire.cxx +++ b/src/BRepFill/BRepFill_OffsetWire.cxx @@ -662,9 +662,11 @@ void BRepFill_OffsetWire::Perform (const Standard_Real Offset, { myShape.Nullify(); myIsDone = Standard_False; +#ifdef BREPFILL_DEB cout<<"An exception was caught in BRepFill_OffsetWire::Perform : "; Standard_Failure::Caught()->Print(cout); cout< tolreached ){ -#ifdef DEB +#ifdef BREPFILL_DEB cout<<"SameParameter : Tolerance not reached!"< Tol ) { -#ifdef DEB +#ifdef BREPFILL_DEB cout << "BRepFill_TrimEdgeTool: no same parameter on the bissectrice" << endl; #endif if(P1xP2x>TolInit) { -#ifdef DEB +#ifdef BREPFILL_DEB cout << "BRepFill_TrimEdgeTool: Continue somehow" << endl; #endif i++; @@ -523,7 +523,7 @@ const } if (ToProj) { -#ifdef DEB +#ifdef BREPFILL_DEB cout << " project extremity bissectrice on parallel."< 0) { -#ifdef DEB +#ifdef BREPFILL_DEB cout << " IntersectWith : " << NbSegments << " Segments of intersection" << endl; #endif @@ -468,11 +468,8 @@ Standard_Real BRepFill_TrimSurfaceTool::ProjOn(const gp_Pnt2d& Point, // evaluate the projection of the point on the curve. Geom2dAPI_ProjectPointOnCurve Projector(Point, C2d); -#ifdef DEB - Standard_Real Dist = -#endif - Projector.LowerDistance(); -#ifdef DEB +#ifdef BREPFILL_DEB + Standard_Real Dist = Projector.LowerDistance(); if ( Dist > Precision::Confusion() ) { cout << " *** WARNING TrimSurfaceTool: *** " << endl; cout << " --> the point is not on the edge" < 0) { TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape itLstEdg; @@ -493,10 +485,6 @@ void BRepLib_FuseEdges::BuildListResultEdges() } -//#ifdef DEB - //if (tFE) cout<DynamicType() == STANDARD_TYPE(Geom_BSplineCurve); @@ -530,9 +518,6 @@ void BRepLib_FuseEdges::BuildListResultEdges() // the curve which is not infinite and limited to old vertices // we try to use ExtendCurveToPoint, then rebuild the NewEdge -//#ifdef DEB - //if (tFE) cout<Copy()); if (!ExtC.IsNull()) { gp_Pnt PF = BRep_Tool::Pnt(VF); @@ -550,9 +535,6 @@ void BRepLib_FuseEdges::BuildListResultEdges() NewEdge = ME.Edge(); -//#ifdef DEB - //if (tFE) cout< 0) { TopTools_DataMapIteratorOfDataMapOfIntegerListOfShape itLstEdg; @@ -613,10 +591,6 @@ void BRepLib_FuseEdges::Perform() } } -//#ifdef DEB - //if (tFE) cout< l[1]+Tol) { cout << "out of limit"< l[1]+Tol) { cout << "out of limit"< 0) l = Projector.LowerDistanceParameter(); -#ifdef DEB +#ifdef BREPOFFSET_DEB else cout<<"ProjectPointOnCurve not done"< Parametres sur Curve1 : "; cout << U1on1 << " " << U1on2 << endl; @@ -2486,7 +2486,7 @@ void BRepOffset_Tool::Inter2d (const TopoDS_Face& F, LV.Clear();LV.Append(VF); LV.Append(VL); } -#ifdef DEB +#ifdef BREPOFFSET_DEB if (!YaSol) { cout <<"Inter2d : Pas de solution"<Print(cout); cout<3 else { -#ifdef DEB +#ifdef BREPTOPADAPTOR_DEB cout << endl; cout << "*** BRepTopAdaptor_Fclass2d ** Wire Probably FALSE **" << endl; cout << "*** The sample wire contains less than 3 points" << endl; @@ -684,7 +684,9 @@ void BRepTopAdaptor_FClass2d::Destroy() { //const BRepTopAdaptor_FClass2d & BRepTopAdaptor_FClass2d::Copy(const BRepTopAdaptor_FClass2d& Other) const { const BRepTopAdaptor_FClass2d & BRepTopAdaptor_FClass2d::Copy(const BRepTopAdaptor_FClass2d& ) const { +#ifdef BREPTOPADAPTOR_DEB cerr<<"Copy not allowed in BRepTopAdaptor_FClass2d"<> aFirstInd >> aLastInd)) return Standard_False; @@ -64,9 +61,7 @@ Standard_Boolean BinMDataStd_ByteArrayDriver::Paste(const BinObjMgt_Persistent& bytes->SetValue(i, aTargetArray.Value(i)); } anAtt->ChangeArray(bytes); -#ifdef DEB - //cout << "CurDocVersion = " << BinMDataStd::DocumentVersion() < 2) { Standard_Byte aDeltaValue; @@ -87,9 +82,6 @@ void BinMDataStd_ByteArrayDriver::Paste(const Handle(TDF_Attribute)& theSource, BinObjMgt_Persistent& theTarget, BinObjMgt_SRelocationTable& ) const { -#ifdef DEB -// cout << "ByteArrayDriver::Store: " << TypeName() << endl; -#endif Handle(TDataStd_ByteArray) anAtt = Handle(TDataStd_ByteArray)::DownCast(theSource); const Standard_Integer aFirstInd = anAtt->Lower(); const Standard_Integer aLastInd = anAtt->Upper(); diff --git a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx index 4505f268b5..9a46f11d73 100644 --- a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx @@ -74,16 +74,10 @@ Standard_Boolean BinMDataStd_ExtStringArrayDriver::Paste } if(ok) { -//#ifdef DEB -// cout << "CurDocVersion = " << BinMDataStd::DocumentVersion() < 2) { Standard_Byte aDeltaValue; if (! (theSource >> aDeltaValue)) { -//#ifdef DEB -// cout <<"DeltaValue = " << (Standard_Integer)aDeltaValue <ChangeMap(aHMap); } -#ifdef DEB - //cout << "CurDocVersion = " << BinMDataStd::DocumentVersion() < 2) { Standard_Byte aDeltaValue; diff --git a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx index fcfd92ae39..f385a8bc5f 100644 --- a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx @@ -63,9 +63,6 @@ Standard_Boolean BinMDataStd_IntegerArrayDriver::Paste if(!theSource.GetIntArray (&aTargetArray(aFirstInd), aLength)) return Standard_False; Standard_Boolean aDelta(Standard_False); -#ifdef DEB - //cout << "CurDocVersion = " << BinMDataStd::DocumentVersion() < 2) { Standard_Byte aDeltaValue; if (! (theSource >> aDeltaValue)) @@ -73,7 +70,7 @@ Standard_Boolean BinMDataStd_IntegerArrayDriver::Paste else aDelta = (Standard_Boolean)aDeltaValue; } -#ifdef DEB +#ifdef BINMDATASTD_DEB else if(BinMDataStd::DocumentVersion() == -1) cout << "Current DocVersion field is not initialized. " <Array()->ChangeArray1(); if(!theSource.GetRealArray (&aTargetArray(aFirstInd), aLength)) return Standard_False; -#ifdef DEB - //cout << "CurDocVersion = " << BinMDataStd::DocumentVersion() < 2) { Standard_Byte aDeltaValue; diff --git a/src/BinMNaming/BinMNaming_NamingDriver.cxx b/src/BinMNaming/BinMNaming_NamingDriver.cxx index 9feb4598d5..48aef78998 100644 --- a/src/BinMNaming/BinMNaming_NamingDriver.cxx +++ b/src/BinMNaming/BinMNaming_NamingDriver.cxx @@ -235,14 +235,11 @@ Standard_Boolean BinMNaming_NamingDriver::Paste WriteMessage (aMsg); } -#ifdef DEB - //cout << "CurDocVersion = " << BinMNaming::DocumentVersion() < 3) { TCollection_AsciiString entry; ok = theSource >> entry; if(ok) { -#ifdef DEB +#ifdef BINMNAMING_DEB cout << "NamingDriver:: Retrieved Context Label = " << entry << " Ok = " << theSource.IsOK() <> nbpol; IS.get();//remove LF -#ifdef DEB -// cout << "ReadPolygonOnTriangulation: NbPoles = "<< nbpol<< endl; -#endif try { OCC_CATCH_SIGNALS for (i=1; i<=nbpol; i++) { -#ifdef DEB -// streampos pos = IS.tellg(); -// cout << "ReadPolygonOnTriangulation: Pos = "<< pos << endl; -#endif BinTools::GetInteger(IS, nbnodes); -#ifdef DEB -// cout << "ReadPolygonOnTriangulation: PoleIndx = "<< i << " NbOfNodes = "<< nbnodes <UDegree(); vdegree = S->VDegree(); -#ifdef DEB -// cout << "\tudegree = " << udegree << ", vdegree = "<< vdegree<Pole(i,j); //Pnt -#ifdef DEB -// cout << "Bezier Surface: Pole Pnt: X = " << S->Pole(i,j).X()<< " Y = " << S->Pole(i,j).Y()<<" Z = " << S->Pole(i,j).Z()<Weight(i,j));//Real -#ifdef DEB -// cout << "Bezier Surface: Put Real" << endl; -#endif } } } -#ifdef DEB -// const Standard_Integer aPos = OS.tellp(); -// cout << "\tEnd of Bezier surface pos = " << aPos << endl; -#endif return OS; } @@ -776,9 +763,6 @@ Standard_IStream& BinTools_SurfaceSet::ReadSurface(Standard_IStream& IS, try { OCC_CATCH_SIGNALS const Standard_Byte stype = (Standard_Byte) IS.get(); -#ifdef DEB -// cout << "ReadSurface: Surface type = " << (Standard_Integer)stype <NbPoints()<<" sections gardees"<NbPoints()<<" sections gardees"< 2*tolgui) State = Blend_StepTooLarge; // Sinon echec recadrage. On sort avec PointsConfondus else { -#if DEB +#if BLEND_DEB cout << "Echec recadrage" << endl; #endif State = Blend_SamePoints; @@ -521,7 +521,7 @@ void Blend_Walking::InternalPerform(Blend_Function& Func, case Blend_SamePoints : { // On arrete -#if DEB +#if BLEND_DEB cout << " Points confondus dans le cheminement" << endl; #endif Ext1.SetValue(previousP.PointOnS1(), diff --git a/src/BlendFunc/BlendFunc_CSCircular.cxx b/src/BlendFunc/BlendFunc_CSCircular.cxx index 0de6914e38..6289acb33e 100644 --- a/src/BlendFunc/BlendFunc_CSCircular.cxx +++ b/src/BlendFunc/BlendFunc_CSCircular.cxx @@ -203,9 +203,6 @@ Standard_Boolean BlendFunc_CSCircular::IsSolution(const math_Vector& Sol, const norm = ncrossns.Magnitude(); if (norm < Eps) { norm = 1.; -//#if DEB -// cout << "CSCircular : Surface singuliere !" << endl; -//#endif } temp.SetXYZ(pts.XYZ() - ptc.XYZ()); @@ -279,9 +276,6 @@ Standard_Boolean BlendFunc_CSCircular::Value(const math_Vector& X, math_Vector& Standard_Real norm = nplan.Crossed(ns).Magnitude(); if (norm < Eps) { norm = 1.; -//#if DEB -// cout << "CSCircular : Surface singuliere !" << endl; -//#endif } ns.SetLinearForm(nplan.Dot(ns)/norm,nplan, -1./norm,ns); @@ -318,9 +312,6 @@ Standard_Boolean BlendFunc_CSCircular::Derivatives(const math_Vector& X, math_Ma norm = ncrossns.Magnitude(); if (norm < Eps) { norm = 1.; -//#if DEB -// cout << "CSCircular : Surface singuliere !" << endl; -//#endif } ndotns = nplan.Dot(ns); @@ -374,9 +365,6 @@ Standard_Boolean BlendFunc_CSCircular::Values(const math_Vector& X, math_Vector& norm = ncrossns.Magnitude(); if (norm < Eps) { norm = 1.; -//#if DEB -// cout << "CSCircular : Surface singuliere !" << endl; -//#endif } ndotns = nplan.Dot(ns); diff --git a/src/BlendFunc/BlendFunc_ConstRad.cxx b/src/BlendFunc/BlendFunc_ConstRad.cxx index 31a8ebf038..ebc169d0d8 100644 --- a/src/BlendFunc/BlendFunc_ConstRad.cxx +++ b/src/BlendFunc/BlendFunc_ConstRad.cxx @@ -283,14 +283,14 @@ Standard_Boolean BlendFunc_ConstRad::ComputeValues(const math_Vector& X, if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1; else { invnorm1 = 1; // Unsatisfactory, but it is not necessary to crash -#if DEB +#if BLENDFUNC_DEB cout << " ConstRad : Surface singuliere " << endl; #endif } if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2; else { invnorm2 = 1; // Unsatisfactory, but it is not necessary to crash -#if DEB +#if BLENDFUNC_DEB cout << " ConstRad : Surface singuliere " << endl; #endif } @@ -878,7 +878,7 @@ Standard_Boolean BlendFunc_ConstRad::IsSolution(const math_Vector& Sol, const St Abs(controle(2)) > tolerances(2) || Abs(controle(3)) > tolerances(3) || Abs(controle(4)) > tolerances(4)){ -#ifdef DEB +#ifdef BLENDFUNC_DEB cout<<"Cheminement : echec calcul des derivees"<D1(U1,V1,bid,d1u,d1v); NmF = ns1 = d1u.Crossed(d1v); surf2->D1(U2,V2,bid,d1u,d1v); @@ -1349,15 +1346,9 @@ void BlendFunc_ConstRad::Section(const Blend_Point& P, norm2 = nplan.Crossed(ns2).Magnitude(); if (norm1 < Eps) { norm1 = 1; // Unsatisfactory, but it is not necessary to stop -//#if DEB -// cout << " ConstRad : Surface singuliere " << endl; -//#endif } if (norm2 < Eps) { norm2 = 1; // Unsatisfactory, but it is not necessary to stop -//#if DEB -// cout << " ConstRad : Surface singuliere " << endl; -//#endif } ns1.SetLinearForm(nplan.Dot(ns1)/norm1,nplan, -1./norm1,ns1); @@ -1480,13 +1471,13 @@ Standard_Boolean BlendFunc_ConstRad::Section norm2 = nplan.Crossed(ns2).Magnitude(); if (norm1 < Eps) { norm1 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " ConstRad : Surface singuliere " << endl; #endif } if (norm2 < Eps) { norm2 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " ConstRad : Surface singuliere " << endl; #endif } @@ -1822,13 +1813,13 @@ Standard_Boolean BlendFunc_ConstRad::Section norm2 = nplan.Crossed(ns2).Magnitude(); if (norm1 < Eps) { norm1 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " ConstRad : Surface singuliere " << endl; #endif } if (norm2 < Eps) { norm2 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " ConstRad : Surface singuliere " << endl; #endif } diff --git a/src/BlendFunc/BlendFunc_ConstRadInv.cxx b/src/BlendFunc/BlendFunc_ConstRadInv.cxx index cf2e82774e..2ae352fc09 100644 --- a/src/BlendFunc/BlendFunc_ConstRadInv.cxx +++ b/src/BlendFunc/BlendFunc_ConstRadInv.cxx @@ -208,15 +208,9 @@ Standard_Boolean BlendFunc_ConstRadInv::Value(const math_Vector& X, Standard_Real norm2 = nplan.Crossed(ns2).Magnitude(); if (norm1 < Eps) { norm1 = 1; -//#if DEB -// cout << " ConstRadInv : Surface singuliere " << endl; -//#endif } if (norm2 < Eps) { norm2 = 1; // Unsatisfactory, but it is not necessary to stop -//#if DEB -// cout << " ConstRadInv : Surface singuliere " << endl; -//#endif } gp_Vec resul; @@ -300,13 +294,13 @@ Standard_Boolean BlendFunc_ConstRadInv::Derivatives(const math_Vector& X, norm2 = ncrossns2.Magnitude(); if (norm1 < Eps) { norm1 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " ConstRadInv : Surface singuliere " << endl; #endif } if (norm2 < Eps) { norm2 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " ConstRadInv : Surface singuliere " << endl; #endif } @@ -481,13 +475,13 @@ Standard_Boolean BlendFunc_ConstRadInv::Values(const math_Vector& X, norm2 = ncrossns2.Magnitude(); if (norm1 < Eps) { norm1 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " ConstRadInv : Surface singuliere " << endl; #endif } if (norm2 < Eps) { norm2 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " ConstRadInv : Surface singuliere " << endl; #endif } diff --git a/src/BlendFunc/BlendFunc_EvolRad.cxx b/src/BlendFunc/BlendFunc_EvolRad.cxx index 5745c2edf7..a9c640f1ef 100644 --- a/src/BlendFunc/BlendFunc_EvolRad.cxx +++ b/src/BlendFunc/BlendFunc_EvolRad.cxx @@ -348,14 +348,14 @@ Standard_Boolean BlendFunc_EvolRad::ComputeValues(const math_Vector& X, if (invnorm1 > Eps) invnorm1 = ((Standard_Real) 1) /invnorm1; else { invnorm1 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " EvolRad : Surface singuliere " << endl; #endif } if (invnorm2 > Eps) invnorm2 = ((Standard_Real) 1) /invnorm2; else { invnorm2 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " EvolRad : Surface singuliere " << endl; #endif } @@ -947,7 +947,7 @@ Standard_Boolean BlendFunc_EvolRad::IsSolution(const math_Vector& Sol, Abs(controle(2)) > tolerances(2) || Abs(controle(3)) > tolerances(3) || Abs(controle(4)) > tolerances(4)){ -#ifdef DEB +#ifdef BLENDFUNC_DEB cout<<"Cheminement : echec calcul des derivees"<D1(U1,V1,bid,d1u,d1v); @@ -1447,13 +1447,13 @@ void BlendFunc_EvolRad::Section(const Blend_Point& P, norm2 = nplan.Crossed(ns2).Magnitude(); if (norm1 < Eps) { norm1 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " EvolRad : Surface singuliere " << endl; #endif } if (norm2 < Eps) { norm2 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " EvolRad : Surface singuliere " << endl; #endif } @@ -1580,13 +1580,13 @@ Standard_Boolean BlendFunc_EvolRad::Section norm2 = nplan.Crossed(ns2).Magnitude(); if (norm1 < Eps) { norm1 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " EvolRad : Surface singuliere " << endl; #endif } if (norm2 < Eps) { norm2 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " EvolRad : Surface singuliere " << endl; #endif } @@ -1926,13 +1926,13 @@ Standard_Boolean BlendFunc_EvolRad::Section norm2 = nplan.Crossed(ns2).Magnitude(); if (norm1 < Eps) { norm1 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " EvolRad : Surface singuliere " << endl; #endif } if (norm2 < Eps) { norm2 = 1; // Unsatisfactory, but it is not necessary to stop -#if DEB +#if BLENDFUNC_DEB cout << " EvolRad : Surface singuliere " << endl; #endif } diff --git a/src/BlendFunc/BlendFunc_EvolRadInv.cxx b/src/BlendFunc/BlendFunc_EvolRadInv.cxx index 2ea8213a37..6bf46eec4f 100644 --- a/src/BlendFunc/BlendFunc_EvolRadInv.cxx +++ b/src/BlendFunc/BlendFunc_EvolRadInv.cxx @@ -212,15 +212,9 @@ Standard_Boolean BlendFunc_EvolRadInv::Value(const math_Vector& X, if (norm1 < Eps) { norm1 = 1.; -//#if DEB -// cout << "EvolRadInv : Surface singuliere " << endl; -//#endif } if (norm2 < Eps) { norm2 = 1.; -//#if DEB -// cout << "EvolRadInv : Surface singuliere " << endl; -//#endif } gp_Vec resul; @@ -323,15 +317,9 @@ Standard_Boolean BlendFunc_EvolRadInv::Values(const math_Vector& X, Standard_Real norm2 = ncrossns2.Magnitude(); if (norm1 < Eps) { norm1 = 1.; -//#if DEB -// cout << "EvolRadInv : Surface singuliere " << endl; -//#endif } if (norm2 < Eps) { norm2 = 1.; -//#if DEB -// cout << "EvolRadInv : Surface singuliere " << endl; -//#endif } gp_Vec resul1,resul2; diff --git a/src/CSLib/CSLib_Class2d.cxx b/src/CSLib/CSLib_Class2d.cxx index 02ab97113c..43ae8e7850 100644 --- a/src/CSLib/CSLib_Class2d.cxx +++ b/src/CSLib/CSLib_Class2d.cxx @@ -300,7 +300,9 @@ Standard_Integer CSLib_Class2d::InternalSiDansOuOn(const Standard_Real Px, //======================================================================= const CSLib_Class2d& CSLib_Class2d::Copy(const CSLib_Class2d& ) const { +#ifdef CSLIB_DEB cerr<<"Copy not allowed in CSLib_Class2d"<3) { Spine->SetFirstStatus(ChFiDS_BreakPoint); -#if DEB +#if CHFI3D_DEB cout<<"top has : "<3) { Spine->SetLastStatus(ChFiDS_BreakPoint); -#if DEB +#if CHFI3D_DEB cout<<"top has : "<Vertex(isfirst,opp).IsOnArc() || SD->TwistOnS1() || SD->TwistOnS2() ) { -#ifdef DEB +#ifdef CHFI3D_DEB cout<<"ChFi3d_Purge : No output on extension."<LastParameter(iloc); if(periodic) wi = ElCLib::InPeriod(wi,WF,WF+period); gp_Pnt pv = Spine->Value(wi); -#ifdef DEB +#ifdef CHFI3D_DEB gp_Pnt pelsapp = curels.Value(wi); Standard_Real distinit = pv.Distance(pelsapp); cout<<"distance psp/papp : "< 0 ){ -#ifdef DEB +#ifdef CHFI3D_DEB cout<< "segments of intersection on the restrictions"<NbPoints(); if (Nbpnt <= 1 && again == 0) { again++; -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"one point of the path MS/50 is attempted."<Point(1).Parameter(); @@ -1010,7 +1010,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData Target = Targetsov; } else if(Nbpnt<=nbptmin){ -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"Number of points is still too small, quit"<NbPoints(); if (Nbpnt <= 1 && again == 0) { again++; -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"one point of path MS/50 is attempted."<Point(1).Parameter(); @@ -1141,7 +1141,7 @@ Standard_Boolean ChFi3d_Builder::ComputeData Target = Targetsov; } else if(Nbpnt<=nbptmin){ -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"Number of points is still too small, quit"<NbPoints(); if (Nbpnt <= 1 && again == 0) { again++; -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"one point of path MS/50 is attempted."<Point(1).Parameter(); @@ -1268,7 +1268,7 @@ Standard_Boolean ChFi3d_Builder::SimulData Target = Targetsov; } else if(Nbpnt<=NbSecMin){ -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"Number of points is still too small, quit"<NbPoints(); if (Nbpnt <= 1 && again == 0) { again++; -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"only one point of path MS/50 is attempted."<Point(1).Parameter(); @@ -1394,7 +1394,7 @@ Standard_Boolean ChFi3d_Builder::SimulData Target = Targetsov; } else if(Nbpnt<=NbSecMin){ -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"Number of points is still too small, quit"<NbPoints(); if (Nbpnt == 0){ -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"0 point of path, quit."<=TolGuide || Abs(lpointpar-u2sov)>=TolGuide){ -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"Number of points is still too small, the step is reduced"<TwistOnS1(Standard_True); -#ifdef DEB +#ifdef CHFI3D_DEB cout<<"Path completed, but TWIST on S1"<TwistOnS2(Standard_True); -#ifdef DEB +#ifdef CHFI3D_DEB cout<<"Parh completed, but TWIST on S2"<NbPoints(); Standard_Real factor = 1./(NbSecMin + 1); if (Nbpnt == 0){ -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"0 point of path, quit."<Point(1).Parameter(); @@ -2170,21 +2170,21 @@ Standard_Boolean ChFi3d_Builder::SimulData Standard_Real u2 = Lin->Point(Nbpnt).Parameter(); if(Abs(u1-u1sov)>=TolGuide || Abs(u2-u2sov)>=TolGuide){ again++; -#ifdef DEB +#ifdef CHFI3D_DEB cout <<"Number of points is still too small, the step is reduced"< 0) { trafil1 = DStr.Shape(Ishape1).Orientation(); } -#ifdef DEB +#ifdef CHFI3D_DEB else { cout<<"erreur"<ChangeVertex(isfirst2,IFaArc2); if (!CP1.IsOnArc() || !CP2.IsOnArc()) { -#if DEB +#if CHFI3D_DEB cout<<"fail 1 of 2 fillets are not on arc"<Absc(Nl,ii); point = Spine->Value(Nl); -#ifdef DEB +#ifdef CHFI3D_DEB if (found) cout << "found by edge " << ii << " : "; cout< 1) { -#ifdef DEB +#ifdef CHFI3D_DEB cout<<"trop d'intersection entre les surfaces"<ChangeSetOfSurfData()->Value(i[deb][pivot])->Index(3-jf[deb][pivot]); ifacfin = CD[fin]->ChangeSetOfSurfData()->Value(i[fin][pivot])->Index(3-jf[fin][pivot]); if(ifacfin != ifacdeb){ -#ifdef DEB +#ifdef CHFI3D_DEB cout<<"several base faces, plate is called"<= Precision::Confusion()) cout<<"Interior extension at the start of guideline"<Value(abscissa->Upper()); if((Par - lll) <= -Precision::Confusion()) cout<<"Interior extension at the end of guideline"<= Precision::Confusion()) cout<<"Interior extension at start of the guideline"<Value(abscissa->Upper()); if(L <= -Precision::Confusion()) cout<<"Interior extension at the end of guideline"< -Precision::Confusion() ) { +#ifdef CHFIKPART_DEB cout<<"wrong choice of angle for the chamfer"<ptol){ -#ifdef DEB +#ifdef CHFIKPART_DEB cout<<"center of the spherical corner not found"<BasisCurve()->LastParameter() > Precision::PConfusion()) { AddElement (PCurve, TopologicalEdge.Orientation()); -#ifdef DEB +#ifdef DBREP_DEB cout << "DBRep_IsoBuilder TrimPCurve : parameters out of range\n"; cout << " U1(" << U1 << "), Umin(" << PCurve->FirstParameter() << "), U2(" << U2 << "), Umax(" << PCurve->LastParameter() << ")\n"; @@ -152,7 +152,7 @@ Geom2dHatch_Hatcher (Geom2dHatch_Intersector (IntersectorConfusion, { if (PCurve->FirstParameter() - U1 > Precision::PConfusion()) { -#ifdef DEB +#ifdef DBREP_DEB cout << "DBRep_IsoBuilder PCurve : parameters out of range\n"; cout << " U1(" << U1 << "), Umin(" << PCurve->FirstParameter() << ")\n"; #endif @@ -160,7 +160,7 @@ Geom2dHatch_Hatcher (Geom2dHatch_Intersector (IntersectorConfusion, } if (PCurve->FirstParameter() - U2 > Precision::PConfusion()) { -#ifdef DEB +#ifdef DBREP_DEB cout << "DBRep_IsoBuilder PCurve : parameters out of range\n"; cout << " U2(" << U2 << "), Umin(" << PCurve->FirstParameter() << ")\n"; #endif @@ -168,7 +168,7 @@ Geom2dHatch_Hatcher (Geom2dHatch_Intersector (IntersectorConfusion, } if (U1 - PCurve->LastParameter() > Precision::PConfusion()) { -#ifdef DEB +#ifdef DBREP_DEB cout << "DBRep_IsoBuilder PCurve : parameters out of range\n"; cout << " U1(" << U1 << "), Umax(" << PCurve->LastParameter() << ")\n"; #endif @@ -176,7 +176,7 @@ Geom2dHatch_Hatcher (Geom2dHatch_Intersector (IntersectorConfusion, } if (U2 - PCurve->LastParameter() > Precision::PConfusion()) { -#ifdef DEB +#ifdef DBREP_DEB cout << "DBRep_IsoBuilder PCurve : parameters out of range\n"; cout << " U2(" << U2 << "), Umax(" << PCurve->LastParameter() << ")\n"; #endif diff --git a/src/DDF/DDF_BrowserCommands.cxx b/src/DDF/DDF_BrowserCommands.cxx index bbea1f9834..5532e64ca2 100644 --- a/src/DDF/DDF_BrowserCommands.cxx +++ b/src/DDF/DDF_BrowserCommands.cxx @@ -71,7 +71,7 @@ static Standard_Integer DFBrowse (Draw_Interpretor& di, aTclScript.AssignCat ( "/dftree.tcl" ); OSD_File aTclScriptFile (aTclScript); if (aTclScriptFile.Exists()) { -#ifdef DEB +#ifdef DDF_DEB cout << "Load " << aTclScript << endl; #endif di.EvalFile( aTclScript.ToCString() ); diff --git a/src/DDF/DDF_IOStream.cxx b/src/DDF/DDF_IOStream.cxx index e903ec0f21..4605d2d591 100644 --- a/src/DDF/DDF_IOStream.cxx +++ b/src/DDF/DDF_IOStream.cxx @@ -644,7 +644,7 @@ Storage_Error DDF_IOStream::BeginReadInfoSection() ReadChar(l,len); if (strncmp(DDF_IOStream::MagicNumber(),l.ToCString(),len) != 0) { -#ifdef DEB +#ifdef DDF_DEB cout<<"BeginReadInfoSection: format error"<ID(); -// aGd.ShallowDump(cout); -#endif + if(!theObject.IsNull() && theObject->ID() == GEOMOBJECT_GUID) { Handle(TDF_Reference) aReference; diff --git a/src/DNaming/DNaming_BooleanOperationDriver.cxx b/src/DNaming/DNaming_BooleanOperationDriver.cxx index dfc93c3dc1..7f57e1c52e 100644 --- a/src/DNaming/DNaming_BooleanOperationDriver.cxx +++ b/src/DNaming/DNaming_BooleanOperationDriver.cxx @@ -104,7 +104,7 @@ Standard_Integer DNaming_BooleanOperationDriver::Execute(TFunction_Logbook& theL Handle(TNaming_NamedShape) anObjectNS; aLab.FindAttribute(TNaming_NamedShape::GetID(), anObjectNS); if (anObjectNS.IsNull() || anObjectNS->IsEmpty()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"BooleanOperationDriver:: Object is empty"<SetFailure(WRONG_ARGUMENT); @@ -115,7 +115,7 @@ Standard_Integer DNaming_BooleanOperationDriver::Execute(TFunction_Logbook& theL Handle(TNaming_NamedShape) aToolNS = DNaming::GetObjectValue(aToolObj); if (aToolNS.IsNull() || aToolNS->IsEmpty()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"BooleanOperationDriver:: Tool is empty"<SetFailure(WRONG_ARGUMENT); @@ -125,7 +125,7 @@ Standard_Integer DNaming_BooleanOperationDriver::Execute(TFunction_Logbook& theL TopoDS_Shape aTOOL = aToolNS->Get(); TopoDS_Shape anOBJECT = anObjectNS->Get(); if (aTOOL.IsNull() || anOBJECT.IsNull()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"BooleanOperationDriver:: Tool is null"<SetFailure(WRONG_ARGUMENT); @@ -262,7 +262,7 @@ void DNaming_BooleanOperationDriver::LoadNamingDS (const TDF_Label& theResultLab const TopoDS_Shape& ObjSh = MS.Shape1(); const TopoDS_Shape& ToolSh = MS.Shape2(); if (ResSh.IsNull()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"LoadFuseNamingDS: The result of the boolean operation is null"<IsEmpty()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"CylinderDriver:: Axis is empty"<SetFailure(WRONG_AXIS); @@ -86,7 +86,7 @@ Standard_Integer DNaming_CylinderDriver::Execute(TFunction_Logbook& theLog) cons } TopoDS_Shape aTopoDSAxis = aNSAxis->Get(); if (aTopoDSAxis.IsNull()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"CylinderDriver:: Axis is null"<SetFailure(WRONG_AXIS); @@ -94,7 +94,7 @@ Standard_Integer DNaming_CylinderDriver::Execute(TFunction_Logbook& theLog) cons } // Creation of gp axis (gp_Ax2): if (aTopoDSAxis.ShapeType() != TopAbs_EDGE && aTopoDSAxis.ShapeType() != TopAbs_WIRE) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"CylinderDriver:: Wrong axis, ShapeType = " << aTopoDSAxis.ShapeType() <SetFailure(WRONG_AXIS); @@ -118,7 +118,7 @@ Standard_Integer DNaming_CylinderDriver::Execute(TFunction_Logbook& theLog) cons anAxis.SetLocation(aP1); } } else { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"CylinderDriver:: I don't support wires for a while"<SetFailure(WRONG_AXIS); diff --git a/src/DNaming/DNaming_FilletDriver.cxx b/src/DNaming/DNaming_FilletDriver.cxx index f5520b3355..4837ef1122 100644 --- a/src/DNaming/DNaming_FilletDriver.cxx +++ b/src/DNaming/DNaming_FilletDriver.cxx @@ -79,7 +79,7 @@ Standard_Integer DNaming_FilletDriver::Execute(TFunction_Logbook& theLog) const Handle(TNaming_NamedShape) aContextNS; aLab.FindAttribute(TNaming_NamedShape::GetID(), aContextNS); if (aContextNS.IsNull() || aContextNS->IsEmpty()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"FilletDriver:: Context is empty"<SetFailure(WRONG_ARGUMENT); @@ -92,7 +92,7 @@ Standard_Integer DNaming_FilletDriver::Execute(TFunction_Logbook& theLog) const if(aRadius < Precision::Confusion()) { aFunction->SetFailure(WRONG_ARGUMENT); -#ifdef DEB +#ifdef DNAMING_DEB cout << "FilletDriver:: Radius < Precision::Confusion" << endl; #endif return -1; @@ -102,7 +102,7 @@ Standard_Integer DNaming_FilletDriver::Execute(TFunction_Logbook& theLog) const Handle(TDataStd_UAttribute) aPathObj = DNaming::GetObjectArg(aFunction,FILLET_PATH); Handle(TNaming_NamedShape) aPathNS = DNaming::GetObjectValue(aPathObj); if (aPathNS.IsNull() || aPathNS->IsEmpty()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"FilletDriver:: Path is empty"<SetFailure(WRONG_ARGUMENT); @@ -112,7 +112,7 @@ Standard_Integer DNaming_FilletDriver::Execute(TFunction_Logbook& theLog) const TopoDS_Shape aPATH = aPathNS->Get(); TopoDS_Shape aCONTEXT = aContextNS->Get(); if (aPATH.IsNull() || aCONTEXT.IsNull()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"FilletDriver:: Path or Context is null"<SetFailure(WRONG_ARGUMENT); diff --git a/src/DNaming/DNaming_ModelingCommands.cxx b/src/DNaming/DNaming_ModelingCommands.cxx index 5d8c9c00ce..05169e07f1 100644 --- a/src/DNaming/DNaming_ModelingCommands.cxx +++ b/src/DNaming/DNaming_ModelingCommands.cxx @@ -218,13 +218,15 @@ static Standard_Integer DNaming_AddDriver (Draw_Interpretor& /*theDI*/, Standard_GUID drvGUID; if(!GetFuncGUID(theArg[i],drvGUID)) continue; aFunctionDrvTable->AddDriver(drvGUID, GetDriver(theArg[i])); -#ifdef DEBUG +#ifdef DNAMING_DEB cout << "DNaming_AddDriver : " << theArg[i] << " driver is added" <IsEmpty()) cout <<"Wrong Context ..." <Label(), entry); cout << "ContextNS Label = " << entry < 3) { -#ifdef DEBUG +#ifdef DNAMING_DEB cout << "NB = " << nb < 4) { -#ifdef DEBUG +#ifdef DNAMING_DEB cout << "NB = " << nb <Label(), entry); -#ifdef DEBUG +#ifdef DNAMING_DEB cout << "First Selection function at " << entry <Label(), entry); cout << "First Selection function at " << entry <IsEmpty()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"PointDriver:: Ref Point is empty"<SetFailure(WRONG_ARGUMENT); diff --git a/src/DNaming/DNaming_SphereDriver.cxx b/src/DNaming/DNaming_SphereDriver.cxx index f8756b696a..02d3056fcd 100644 --- a/src/DNaming/DNaming_SphereDriver.cxx +++ b/src/DNaming/DNaming_SphereDriver.cxx @@ -79,7 +79,7 @@ Standard_Integer DNaming_SphereDriver::Execute(TFunction_Logbook& theLog) const Handle(TDataStd_UAttribute) anObject = DNaming::GetObjectArg(aFunction,SPHERE_CENTER); Handle(TNaming_NamedShape) aNSCnt = DNaming::GetObjectValue(anObject); if (aNSCnt.IsNull() || aNSCnt->IsEmpty()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"SphereDriver:: Center point is null or empty"<SetFailure(WRONG_ARGUMENT); @@ -96,7 +96,7 @@ Standard_Integer DNaming_SphereDriver::Execute(TFunction_Logbook& theLog) const TopoDS_Shape aCntShape = aNSCnt->Get(); if(aCntShape.IsNull()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"SphereDriver:: Center point is null"<SetFailure(WRONG_ARGUMENT); diff --git a/src/DNaming/DNaming_TransformationDriver.cxx b/src/DNaming/DNaming_TransformationDriver.cxx index fc72ce984c..0f0076f846 100644 --- a/src/DNaming/DNaming_TransformationDriver.cxx +++ b/src/DNaming/DNaming_TransformationDriver.cxx @@ -111,7 +111,7 @@ Standard_Integer DNaming_TransformationDriver::Execute(TFunction_Logbook& theLog Handle(TNaming_NamedShape) aContextNS; aLab.FindAttribute(TNaming_NamedShape::GetID(), aContextNS); if (aContextNS.IsNull() || aContextNS->IsEmpty()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"TransformationDriver:: Context is empty"<SetFailure(WRONG_CONTEXT); @@ -342,7 +342,7 @@ void DNaming_TransformationDriver::LoadNamingDS (const TDF_Label& theResultLabel return; const TopoDS_Shape& aSrcShape = theSourceNS->Get(); if (aSrcShape.IsNull()) { -#ifdef DEB +#ifdef DNAMING_DEB cout<<"DNaming_TransformationDriver::LoadNamingDS: The result of the Transform operation is null"<GetData(),arg[2],L)) return 1; Standard_GUID guid; TCollection_ExtendedString str = arg[3]; -#ifdef DEB +#ifdef DPRSSTD_DEB cout << "Inputed parameter > " << str << endl; #endif if ( str == "A" ) //axis @@ -195,7 +195,7 @@ static Standard_Integer DPrsStd_AISSet (Draw_Interpretor& di, // guid = TSketchStd_Edge::GetID(); //"b3aac90a-5b78-11d1-8940-080009dc3333" Handle(TPrsStd_AISPresentation) prs= TPrsStd_AISPresentation::Set(L, guid); -#ifdef DEB +#ifdef DPRSSTD_DEB cout << "Driver GUID = "; prs->GetDriverGUID().ShallowDump(cout); cout << "\n"; @@ -240,7 +240,7 @@ static Standard_Integer DPrsStd_AISDriver (Draw_Interpretor& di, } else { TCollection_ExtendedString str = arg[3]; -#ifdef DEB +#ifdef DPRSSTD_DEB cout << "Inputed parameter > " << str << endl; #endif if ( str == "A" ) //axis diff --git a/src/Draft/Draft_Modification_1.cxx b/src/Draft/Draft_Modification_1.cxx index 33591da6dd..3b9d05c543 100644 --- a/src/Draft/Draft_Modification_1.cxx +++ b/src/Draft/Draft_Modification_1.cxx @@ -1376,7 +1376,7 @@ void Draft_Modification::Perform () GeomAPI_ProjectPointOnCurve Projector( vtori, Einf1.Geometry() ); //patch pvt = Projector.NearestPoint(); -#ifdef DEB +#ifdef DRAFT_DEB static Standard_Integer VertexRecomp = 1; if (VertexRecomp!=0) { cout << "pori :" << vtori.X() << " " << vtori.Y() << " " << vtori.Z() << endl; @@ -1395,7 +1395,7 @@ void Draft_Modification::Perform () gp_Pnt opvt; Einf2.Geometry()->D0(Vinf.Parameter(Edg2), opvt); -#ifdef DEB +#ifdef DRAFT_DEB if (VertexRecomp!=0) { cout << " Edg 2 :" << Vinf.Parameter(Vinf.Edge()) << endl; cout << "opvt " << opvt.X() << " " << opvt.Y() << " " << opvt.Z() << endl; @@ -1609,7 +1609,7 @@ Handle(Geom_Surface) Draft_Modification::NewSurface else if (TypeS == STANDARD_TYPE(Geom_CylindricalSurface)) { Standard_Real testdir = Direction.Dot(NeutralPlane.Axis().Direction()); if (Abs(testdir) <= 1.-Precision::Angular()) { -#ifdef DEB +#ifdef DRAFT_DEB cout << "NewSurfaceCyl:Draft_Direction_and_Neutral_Perpendicular" << endl; #endif return NewS; @@ -1617,7 +1617,7 @@ Handle(Geom_Surface) Draft_Modification::NewSurface gp_Cylinder Cy = Handle(Geom_CylindricalSurface)::DownCast(S)->Cylinder(); testdir = Direction.Dot(Cy.Axis().Direction()); if (Abs(testdir) <= 1.-Precision::Angular()) { -#ifdef DEB +#ifdef DRAFT_DEB cout << "NewSurfaceCyl:Draft_Direction_and_Cylinder_Perpendicular" << endl; #endif return NewS; @@ -1637,7 +1637,7 @@ Handle(Geom_Surface) Draft_Modification::NewSurface } if (!isIntDone || i2s.TypeInter() != IntAna_Circle) { -#ifdef DEB +#ifdef DRAFT_DEB cout << "NewSurfaceCyl:Draft_Intersection_Neutral_Cylinder_NotDone" << endl; #endif return NewS; @@ -1674,7 +1674,7 @@ Handle(Geom_Surface) Draft_Modification::NewSurface Standard_Real testdir = Direction.Dot(NeutralPlane.Axis().Direction()); if (Abs(testdir) <= 1.-Precision::Angular()) { -#ifdef DEB +#ifdef DRAFT_DEB cout << "NewSurfaceCone:Draft_Direction_and_Neutral_Perpendicular" << endl; #endif return NewS; @@ -1684,7 +1684,7 @@ Handle(Geom_Surface) Draft_Modification::NewSurface testdir = Direction.Dot(Co1.Axis().Direction()); if (Abs(testdir) <= 1.-Precision::Angular()) { -#ifdef DEB +#ifdef DRAFT_DEB cout << "NewSurfaceCone:Draft_Direction_and_Cone_Perpendicular" << endl; #endif return NewS; @@ -1694,7 +1694,7 @@ Handle(Geom_Surface) Draft_Modification::NewSurface IntAna_QuadQuadGeo i2s; i2s.Perform(NeutralPlane,Co1,Precision::Angular(),Precision::Confusion()); if (!i2s.IsDone() || i2s.TypeInter() != IntAna_Circle) { -#ifdef DEB +#ifdef DRAFT_DEB cout << "NewSurfaceCone:Draft_Intersection_Neutral_Conical_NotDone" << endl; #endif return NewS; @@ -1735,7 +1735,7 @@ Handle(Geom_Surface) Draft_Modification::NewSurface } } else { -#ifdef DEB +#ifdef DRAFT_DEB cout << "NewSurface:Draft_SurfNotYetImplemented" << endl; #endif } diff --git a/src/Draw/Draw.cxx b/src/Draw/Draw.cxx index 30e6a626d1..30dc26a82b 100644 --- a/src/Draw/Draw.cxx +++ b/src/Draw/Draw.cxx @@ -516,7 +516,7 @@ void Draw::Load(Draw_Interpretor& theDI, const TCollection_AsciiString& theKey, aMsg << aPluginResource->Value(theKey.ToCString()); aMsg << "; reason: "; aMsg << error.ToCString(); -#ifdef DEB +#ifdef DRAW_DEB cout << "could not open: " << aPluginResource->Value(theKey.ToCString())<< " ; reason: "<< error.ToCString() << endl; #endif Draw_Failure::Raise(aMsg); diff --git a/src/Draw/Draw_Interpretor.cxx b/src/Draw/Draw_Interpretor.cxx index 95ee63a725..e982f87564 100644 --- a/src/Draw/Draw_Interpretor.cxx +++ b/src/Draw/Draw_Interpretor.cxx @@ -561,7 +561,7 @@ Draw_Interpretor::~Draw_Interpretor() Tcl_Exit(0); } catch (Standard_Failure) { -#ifdef DEB +#ifdef DRAW_DEB cout <<"Tcl_Exit have an exeption" << endl; #endif } diff --git a/src/Draw/Draw_PloadCommands.cxx b/src/Draw/Draw_PloadCommands.cxx index 1fb6727d3f..474f4589e0 100644 --- a/src/Draw/Draw_PloadCommands.cxx +++ b/src/Draw/Draw_PloadCommands.cxx @@ -48,7 +48,7 @@ static Standard_Boolean FindPluginFile (TCollection_AsciiString& thePluginName, // check if the file name has been specified and use default value if not if (thePluginName.IsEmpty()) { thePluginName += "DrawPlugin"; -#ifdef DEB +#ifdef DRAW_DEB cout << "Plugin file name has not been specified. Defaults to " << thePluginName.ToCString() << endl; #endif } @@ -82,7 +82,7 @@ static Standard_Boolean FindPluginFile (TCollection_AsciiString& thePluginName, if (aToSetCSFVariable) { OSD_Environment aCSFVarEnv ( aCSFVariable, aPluginDir ); aCSFVarEnv.Build(); -#ifdef DEB +#ifdef DRAW_DEB cout << "Variable " << aCSFVariable.ToCString() << " has not been explicitly defined. Set to " << aPluginDir.ToCString() << endl; #endif if ( aCSFVarEnv.Failed() ) { @@ -115,7 +115,7 @@ static void Parse (Draw_MapOfAsciiString& theMap) const TCollection_AsciiString& aKey = theMap.FindKey(j); TCollection_AsciiString aResource = aKey; if(myResources->Find(aResource.ToCString())) { -#ifdef DEB +#ifdef DRAW_DEB cout << "Parse Value ==> " << myResources->Value(aResource.ToCString()) << endl; #endif TCollection_AsciiString aValue(myResources->Value(aResource.ToCString())); @@ -123,7 +123,7 @@ static void Parse (Draw_MapOfAsciiString& theMap) Standard_Integer i=1; for(;;) { TCollection_AsciiString aCurKey = aValue.Token(" \t,", i++); -#ifdef DEB +#ifdef DRAW_DEB cout << "Parse aCurKey = " << aCurKey.ToCString() << endl; #endif if(aCurKey.IsEmpty()) break; @@ -211,12 +211,12 @@ static Standard_Integer Pload (Draw_Interpretor& di, for(j = 1; j <= aMapExtent; j++) { const TCollection_AsciiString& aKey = aMap.FindKey(j); TCollection_AsciiString aResource = aKey; -#ifdef DEB +#ifdef DRAW_DEB cout << "aResource = " << aResource << endl; #endif if(myResources->Find(aResource.ToCString())) { const TCollection_AsciiString& aValue = myResources->Value(aResource.ToCString()); -#ifdef DEB +#ifdef DRAW_DEB cout << "Value ==> " << aValue << endl; #endif @@ -234,12 +234,12 @@ static Standard_Integer Pload (Draw_Interpretor& di, OSD_File aTclScriptFile ( aTclScriptFileName ); OSD_File aTclScriptFileDefaults ( aTclScriptFileNameDefaults ); if (!aTclScriptDir.IsEmpty() && aTclScriptFile.Exists()) { -#ifdef DEB +#ifdef DRAW_DEB cout << "Load " << aTclScriptFileName << " TclScript" << endl; #endif di.EvalFile( aTclScriptFileName.ToCString() ); } else if (!aPluginDir.IsEmpty() && aTclScriptFileDefaults.Exists()) { -#ifdef DEB +#ifdef DRAW_DEB cout << "Load " << aTclScriptFileNameDefaults << " TclScript" << endl; #endif di.EvalFile( aTclScriptFileNameDefaults.ToCString() ); diff --git a/src/DrawDim/DrawDim_PlanarDiameter.cxx b/src/DrawDim/DrawDim_PlanarDiameter.cxx index b04654e74a..0694a16a9c 100644 --- a/src/DrawDim/DrawDim_PlanarDiameter.cxx +++ b/src/DrawDim/DrawDim_PlanarDiameter.cxx @@ -76,5 +76,7 @@ void DrawDim_PlanarDiameter::DrawOn(Draw_Display& dis) const return; } } +#ifdef DRAWDIM_DEB cout << " DrawDim_PlanarDiameter::DrawOn : dimension error" << endl; +#endif } diff --git a/src/DrawDim/DrawDim_PlanarDistance.cxx b/src/DrawDim/DrawDim_PlanarDistance.cxx index b6bc35f63c..690c519a4f 100644 --- a/src/DrawDim/DrawDim_PlanarDistance.cxx +++ b/src/DrawDim/DrawDim_PlanarDistance.cxx @@ -112,5 +112,7 @@ void DrawDim_PlanarDistance::DrawOn(Draw_Display& dis) const } } } +#ifdef DRAWDIM_DEB cout << " DrawDim_PlanarDistance::DrawOn : dimension error" << endl; +#endif } diff --git a/src/DrawDim/DrawDim_PlanarRadius.cxx b/src/DrawDim/DrawDim_PlanarRadius.cxx index ed1ddcb9f9..9b5afdf384 100644 --- a/src/DrawDim/DrawDim_PlanarRadius.cxx +++ b/src/DrawDim/DrawDim_PlanarRadius.cxx @@ -74,5 +74,7 @@ void DrawDim_PlanarRadius::DrawOn(Draw_Display& dis) const return; } } +#ifdef DRAWDIM_DEB cout << " DrawDim_PlanarRadius::DrawOn : dimension error" << endl; +#endif } diff --git a/src/DrawDim/DrawDim_Radius.cxx b/src/DrawDim/DrawDim_Radius.cxx index c617bbbfdc..7c3d7cf830 100644 --- a/src/DrawDim/DrawDim_Radius.cxx +++ b/src/DrawDim/DrawDim_Radius.cxx @@ -78,8 +78,9 @@ void DrawDim_Radius::DrawOn(Draw_Display& dis) const //void AIS_RadiusDimension::ComputeOneFaceRadius(const Handle(Prs3d_Presentation)& aPresentation) //{ - +#ifdef DRAWDIM_DEB cout << "entree dans computeonefaceradius"<< endl; +#endif BRepAdaptor_Surface surfAlgo (TopoDS::Face(myFShape)); Standard_Real uFirst, uLast, vFirst, vLast; uFirst = surfAlgo.FirstUParameter(); diff --git a/src/FEmTool/FEmTool_Assembly.cxx b/src/FEmTool/FEmTool_Assembly.cxx index b1f1515b9e..d7ea54e4c2 100644 --- a/src/FEmTool/FEmTool_Assembly.cxx +++ b/src/FEmTool/FEmTool_Assembly.cxx @@ -200,7 +200,7 @@ Standard_Boolean FEmTool_Assembly::Solve() { IsSolved = H->Decompose(); -#if DEB +#if FEMTOOL_DEB if (!IsSolved) { cout << "Solve Echec H = " << endl; H->OutM(); diff --git a/src/FSD/FSD_CmpFile.cxx b/src/FSD/FSD_CmpFile.cxx index 4b681cd64b..9fd33742b8 100644 --- a/src/FSD/FSD_CmpFile.cxx +++ b/src/FSD/FSD_CmpFile.cxx @@ -587,13 +587,17 @@ Storage_BaseDriver& FSD_CmpFile::GetReal(Standard_Real& aValue) realbuffer[0] = '\0'; if (!(myStream >> realbuffer)) { +#ifdef FSD_DEB cerr << "%%%ERROR: read error of double at offset " << myStream.tellg() << endl; cerr << "\t buffer is" << realbuffer<< endl; +#endif Storage_StreamTypeMismatchError::Raise(); } if (!OSD::CStringToReal(realbuffer,aValue)) { +#ifdef FSD_DEB cerr << "%%%ERROR: read error of double at offset " << myStream.tellg() << endl; cerr << "\t buffer is" << realbuffer<< endl; +#endif Storage_StreamTypeMismatchError::Raise(); } diff --git a/src/Font/Font_FTFont.cxx b/src/Font/Font_FTFont.cxx index 626530f248..213f6b6880 100755 --- a/src/Font/Font_FTFont.cxx +++ b/src/Font/Font_FTFont.cxx @@ -76,7 +76,7 @@ bool Font_FTFont::Init (const NCollection_String& theFontPath, myPointSize = thePointSize; if (!myFTLib->IsValid()) { - std::cerr << "FreeType library is unavailable!\n"; + //std::cerr << "FreeType library is unavailable!\n"; Release(); return false; } diff --git a/src/GeomFill/GeomFill_ConstrainedFilling.cxx b/src/GeomFill/GeomFill_ConstrainedFilling.cxx index a74b8a1f12..ba7b1efcd1 100644 --- a/src/GeomFill/GeomFill_ConstrainedFilling.cxx +++ b/src/GeomFill/GeomFill_ConstrainedFilling.cxx @@ -217,7 +217,7 @@ static void coonscnd(const Standard_Integer nb, if(scal1 > tolang) { Standard_Real killfactor = tolang/scal1; stat[i].DoKill(killfactor); -#ifdef DEB +#ifdef GEOMFILL_DEB cout<<"pb coons cnd coin : "<ChangeValue(i) = Min(Sqrt(2*NullTol/norm), MaxSingular); else mySnglLen->ChangeValue(i) = MaxSingular; } -#if DEB +#if GEOMFILL_DEB for(i = 1; i <= mySngl->Length(); i++) { cout<<"Sngl("<Value(i)<<" Length = "<Value(i)<ChangeValue(i) = tmpSeq(i).Y(); } } -#if DEB +#if GEOMFILL_DEB cout<<"After merging"<Length(); i++) { cout<<"Sngl("<Value(i)<<" Length = "<Value(i)< #endif -#if DEB +#if GEOMFILL_DEB static void TracePlan(const Handle(Geom_Surface)& /*Plan*/) { cout << "Pas d'intersection Guide/Plan" << endl; @@ -142,7 +142,7 @@ GeomFill_GuideTrihedronPlan::GeomFill_GuideTrihedronPlan (const Handle(Adaptor3d Int.Perform(myTrimG, Pl); // intersection plan / guide if (Int.NbPoints() == 0) { -#if DEB +#if GEOMFILL_DEB TracePlan(Plan); #endif w = (fabs(myGuide->LastParameter() -w) > fabs(myGuide->FirstParameter()-w) ? myGuide->FirstParameter() : myGuide->LastParameter()); @@ -179,7 +179,7 @@ GeomFill_GuideTrihedronPlan::GeomFill_GuideTrihedronPlan (const Handle(Adaptor3d } } -#if DEB +#if GEOMFILL_DEB if (Abs(Diff) > DeltaG) { cout << "Trihedron Plan Diff on Guide : " << Diff << endl; @@ -254,7 +254,7 @@ void GeomFill_GuideTrihedronPlan::SetCurve(const Handle(Adaptor3d_HCurve)& C) BiNormal.Normalized(); } else { // Erreur... -#if DEB +#if GEOMFILL_DEB cout << "D0 :"; // plan ortho a la trajectoire pour determiner Pprime Handle(Geom_Plane) Plan = new (Geom_Plane)(P, Tangent); @@ -349,7 +349,7 @@ void GeomFill_GuideTrihedronPlan::SetCurve(const Handle(Adaptor3d_HCurve)& C) DTangent.Crossed(Normal)); } else {// Erreur... -#if DEB +#if GEOMFILL_DEB cout << "D1 :"; // plan ortho a la trajectoire Handle(Geom_Plane) Plan = new (Geom_Plane)(P, Tangent); diff --git a/src/GeomFill/GeomFill_LocationGuide.cxx b/src/GeomFill/GeomFill_LocationGuide.cxx index d52bcb71b0..ee8ff094af 100644 --- a/src/GeomFill/GeomFill_LocationGuide.cxx +++ b/src/GeomFill/GeomFill_LocationGuide.cxx @@ -68,7 +68,7 @@ static Standard_Integer Affich = 0; //function : TraceRevol //purpose : Trace la surface de revolution (Debug) //======================================================================= -#if DEB +#if GEOMFILL_DEB static void TraceRevol(const Standard_Real t, const Standard_Real s, const Handle(GeomFill_TrihedronWithGuide)& Law, @@ -343,7 +343,7 @@ static void InGoodPeriod(const Standard_Real Prec, Standard_Real theU = 0., theV = 0.; if (!DistMini.IsDone() || DistMini.NbExt() == 0) { -#if DEB +#if GEOMFILL_DEB cout <<"LocationGuide : Pas d'intersection"< DeltaG) { cout << "Location :: Diff on Guide : " << Diff << endl; @@ -435,7 +435,7 @@ static void InGoodPeriod(const Standard_Real Prec, InGoodPeriod (OldAngle, 2*M_PI, Angle); Diff = Angle - OldAngle; } -#if DEB +#if GEOMFILL_DEB if (Abs(Diff) > M_PI/4) { cout << "Diff d'angle trop grand !!" << endl; } @@ -451,7 +451,7 @@ static void InGoodPeriod(const Standard_Real Prec, InGoodPeriod (myPoles2d->Value(2, ii-1).Y(), UPeriod, v); } Diff = v - myPoles2d->Value(2, ii-1).Y(); -#if DEB +#if GEOMFILL_DEB if (Abs(Diff) > (Ul-Uf)/(2+NbKnots)) { cout << "Diff sur section trop grand !!" << endl; } @@ -630,7 +630,7 @@ static void InGoodPeriod(const Standard_Real Prec, M.SetCols(n, b, t); } else { -#if DEB +#if GEOMFILL_DEB cout << "LocationGuide::D0 : No Result !"<FirstParameter()); cout << "LocationGuide::D0 : No Result !"< #include -#ifdef DEB +#ifdef GEOMFILL_DEB # ifdef DRAW # include # endif @@ -58,7 +58,7 @@ static Standard_Boolean Affich = 0; static Standard_Integer NbSurf = 0; #endif -#ifdef DEB +#ifdef GEOMFILL_DEB // verification des fonctions de derivation D1 et D2 par differences finies Standard_Boolean verifD1(const TColgp_Array1OfPnt& P1, const TColStd_Array1OfReal& W1, @@ -362,7 +362,7 @@ GeomFill_NSections::GeomFill_NSections(const TColGeom_SequenceOfCurve& NC, if (NullWeight) return Standard_False; // verif par diff finies sous debug sauf pour les surfaces periodiques -#ifdef DEB +#ifdef GEOMFILL_DEB if (!mySurface->IsVPeriodic()) { Standard_Real pas = 1.e-6, wTol = 1.e-4, pTol = 1.e-3; Standard_Real V1,V2; @@ -456,7 +456,7 @@ GeomFill_NSections::GeomFill_NSections(const TColGeom_SequenceOfCurve& NC, if (NullWeight) return Standard_False; // verif par diff finies sous debug sauf pour les surfaces periodiques -#ifdef DEB +#ifdef GEOMFILL_DEB if (!mySurface->IsVPeriodic()) { Standard_Real V1,V2; Standard_Boolean ok1,ok2; @@ -611,7 +611,7 @@ GeomFill_NSections::GeomFill_NSections(const TColGeom_SequenceOfCurve& NC, if (mySurface->VDegree()<2) { mySurface->IncreaseDegree(mySurface->UDegree(),2); } -#ifdef DEB +#ifdef GEOMFILL_DEB NbSurf++; if (Affich) { #ifdef DRAW diff --git a/src/GeomFill/GeomFill_Pipe.cxx b/src/GeomFill/GeomFill_Pipe.cxx index d882227051..52abf5bb50 100644 --- a/src/GeomFill/GeomFill_Pipe.cxx +++ b/src/GeomFill/GeomFill_Pipe.cxx @@ -498,7 +498,7 @@ void GeomFill_Pipe::Init(const Handle(Geom_Curve)& Path, } case GeomFill_IsDarboux : -#if DEB +#if GEOMFILL_DEB { cout << "Option Darboux: non realisable" << endl; } @@ -875,7 +875,7 @@ void GeomFill_Pipe::Perform(const Standard_Real Tol, myAdpPath->LastParameter(), Tol, Tol, 0., 0.01, TheConti, DegMax, NbMaxSegment); -#if DEB +#if GEOMFILL_DEB cout << "Tuyau : "; App.Dump(cout); cout << endl; diff --git a/src/GeomFill/GeomFill_SectionPlacement.cxx b/src/GeomFill/GeomFill_SectionPlacement.cxx index b8813915cf..9075c4c8a8 100644 --- a/src/GeomFill/GeomFill_SectionPlacement.cxx +++ b/src/GeomFill/GeomFill_SectionPlacement.cxx @@ -581,7 +581,7 @@ void GeomFill_SectionPlacement::Perform(const Handle(Adaptor3d_HCurve)& Path, } } */ -#if DEB +#if GEOMFILL_DEB if (Intersector.NbPoints() == 0) { Intersector.Dump(); } diff --git a/src/GeomFill/GeomFill_Sweep.cxx b/src/GeomFill/GeomFill_Sweep.cxx index b74a2ee3f4..b3519d6ea3 100644 --- a/src/GeomFill/GeomFill_Sweep.cxx +++ b/src/GeomFill/GeomFill_Sweep.cxx @@ -282,7 +282,7 @@ GeomFill_Sweep::GeomFill_Sweep(const Handle(GeomFill_LocationLaw)& Location, if (Approx.IsDone()) { Ok = Standard_True; -#if DEB +#if GEOMFILL_DEB Approx.Dump(cout); #endif @@ -452,7 +452,7 @@ GeomFill_Sweep::GeomFill_Sweep(const Handle(GeomFill_LocationLaw)& Location, Segmax, eval, Preferentiel); -#if DEB +#if GEOMFILL_DEB Approx.Dump(cout); #endif @@ -1034,7 +1034,7 @@ static Standard_Boolean IsSweepParallelSpine (const Handle(GeomFill_LocationLaw) mySurface = new (Geom_RectangularTrimmedSurface) (S,UFirst, ULast, Standard_True); -#if DEB +#if GEOMFILL_DEB if (isUPeriodic && !mySurface->IsUPeriodic()) cout<<"Pb de periodicite en U" << endl; if (isUPeriodic && !mySurface->IsUClosed()) diff --git a/src/GeomFill/GeomFill_SweepSectionGenerator.cxx b/src/GeomFill/GeomFill_SweepSectionGenerator.cxx index bba3f202c6..09c2740a6c 100644 --- a/src/GeomFill/GeomFill_SweepSectionGenerator.cxx +++ b/src/GeomFill/GeomFill_SweepSectionGenerator.cxx @@ -353,7 +353,9 @@ void GeomFill_SweepSectionGenerator::Perform(const Standard_Boolean Polynomial) } else if (D1Ref.IsOpposite(D1, Precision::Angular())) +#ifdef GEOMFILL_DEB cout <<"Que fais-je ???? " << endl; +#endif // TR is the transformation between (i-1) section and the i-th. TR = Rot * Trans; diff --git a/src/GeomLib/GeomLib.cxx b/src/GeomLib/GeomLib.cxx index 4cff60df63..e3984aeab8 100644 --- a/src/GeomLib/GeomLib.cxx +++ b/src/GeomLib/GeomLib.cxx @@ -1748,7 +1748,7 @@ void GeomLib::ExtendSurfByLength(Handle(Geom_BoundedSurface)& Surface, } if (NullWeight) { -#if DEB +#if GEOMLIB_DEB cout << "Echec de l'Extension rationnelle" << endl; #endif lambmin /= 3.; @@ -1848,7 +1848,7 @@ void GeomLib::Inertia(const TColgp_Array1OfPnt& Points, math_Jacobi J(M); if (!J.IsDone()) { -#if DEB +#if GEOMLIB_DEB cout << "Erreur dans Jacobbi" << endl; M.Dump(cout); #endif diff --git a/src/GeomToIGES/GeomToIGES_GeomCurve.cxx b/src/GeomToIGES/GeomToIGES_GeomCurve.cxx index 03b43ecb0f..413bfe02a6 100644 --- a/src/GeomToIGES/GeomToIGES_GeomCurve.cxx +++ b/src/GeomToIGES/GeomToIGES_GeomCurve.cxx @@ -325,7 +325,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomCurve::TransferCurve } } catch ( Standard_Failure ) { -#ifdef DEB +#ifdef GEOMTOIGES_DEB cout << "Warning: GeomToIGES_GeomCurve: can't trim bspline" << endl; cout << "Warning: Exception in Segment(): " ; Standard_Failure::Caught()->Print(cout); @@ -845,7 +845,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomCurve::TransferCurve return res; } catch(Standard_Failure){ -#ifdef DEB +#ifdef GEOMTOIGES_DEB cout << "writing non-planar offset curve."<Print(cout); diff --git a/src/GeomToStep/GeomToStep_MakeBoundedCurve.cxx b/src/GeomToStep/GeomToStep_MakeBoundedCurve.cxx index 1a26333571..b30e496000 100644 --- a/src/GeomToStep/GeomToStep_MakeBoundedCurve.cxx +++ b/src/GeomToStep/GeomToStep_MakeBoundedCurve.cxx @@ -67,7 +67,7 @@ GeomToStep_MakeBoundedCurve::GeomToStep_MakeBoundedCurve ( const Handle(Geom_Bou } } else { -#ifdef DEB +#ifdef GEOMTOSTEP_DEB cout<<"MakeBoundedCurve, type : "<DynamicType()->Name()<<" not processed"<DynamicType() << endl; #endif done = Standard_False; @@ -96,7 +96,7 @@ GeomToStep_MakeConic::GeomToStep_MakeConic ( const Handle(Geom2d_Conic)& C) else { // Attention : Other 2d conics shall be implemented ... // To be performed later ! -#ifdef DEBUG +#ifdef GEOMTOSTEP_DEB cout << "2D conic not yet implemented" << endl; #endif done = Standard_False; diff --git a/src/GeomToStep/GeomToStep_MakeCurve.cxx b/src/GeomToStep/GeomToStep_MakeCurve.cxx index d40a852cb3..417b33f7ec 100644 --- a/src/GeomToStep/GeomToStep_MakeCurve.cxx +++ b/src/GeomToStep/GeomToStep_MakeCurve.cxx @@ -73,7 +73,7 @@ GeomToStep_MakeCurve::GeomToStep_MakeCurve ( const Handle(Geom_Curve)& C) B = BZ; } else { -#ifdef DEB +#ifdef GEOMTOSTEP_DEB cout<<"GeomToStep_MakeCurve, TrimmedCurve, BasisCurve is transferred not trimmed"<DynamicType()->Name()<Circ2d(); if (!C2d.IsDirect()) { -#ifdef DEB +#ifdef GEOMTOSTEP_DEB cout << "Warning : Circle converted to BSpline." << endl; #endif Handle(Geom2d_BSplineCurve) aBSplineCurve2d = @@ -132,7 +132,7 @@ GeomToStep_MakeCurve::GeomToStep_MakeCurve ( const Handle(Geom2d_Curve)& C) Handle(Geom2d_Ellipse) theE2d = Handle(Geom2d_Ellipse)::DownCast(C); gp_Elips2d E2d = theE2d->Elips2d(); if (!E2d.IsDirect()) { -#ifdef DEB +#ifdef GEOMTOSTEP_DEB cout << "Warning : Ellipse converted to BSpline." << endl; #endif Handle(Geom2d_BSplineCurve) aBSplineCurve2d = diff --git a/src/GeomToStep/GeomToStep_MakeSurface.cxx b/src/GeomToStep/GeomToStep_MakeSurface.cxx index 456fe03c53..f820a031b0 100644 --- a/src/GeomToStep/GeomToStep_MakeSurface.cxx +++ b/src/GeomToStep/GeomToStep_MakeSurface.cxx @@ -68,7 +68,7 @@ GeomToStep_MakeSurface::GeomToStep_MakeSurface ( const Handle(Geom_Surface)& S) } else { done = Standard_False; -#ifdef DEB +#ifdef GEOMTOSTEP_DEB cout << " unknown type " << S->DynamicType()->Name() << endl; #endif } diff --git a/src/GeomTools/GeomTools_Curve2dSet.cxx b/src/GeomTools/GeomTools_Curve2dSet.cxx index e089f0bdd7..b90a904dd8 100644 --- a/src/GeomTools/GeomTools_Curve2dSet.cxx +++ b/src/GeomTools/GeomTools_Curve2dSet.cxx @@ -827,7 +827,7 @@ Standard_IStream& GeomTools_Curve2dSet::ReadCurve2d(Standard_IStream& IS, } } catch(Standard_Failure) { -#ifdef DEB +#ifdef GEOMTOOLS_DEB Handle(Standard_Failure) anExc = Standard_Failure::Caught(); cout <<"EXCEPTION in GeomTools_Curve2dSet::ReadCurve2d(..)!!!" << endl; cout << anExc << endl; diff --git a/src/GeomTools/GeomTools_CurveSet.cxx b/src/GeomTools/GeomTools_CurveSet.cxx index a7e98385f8..90ad9fb772 100644 --- a/src/GeomTools/GeomTools_CurveSet.cxx +++ b/src/GeomTools/GeomTools_CurveSet.cxx @@ -848,7 +848,7 @@ Standard_IStream& GeomTools_CurveSet::ReadCurve(Standard_IStream& IS, } } catch(Standard_Failure) { -#ifdef DEB +#ifdef GEOMTOOLS_DEB Handle(Standard_Failure) anExc = Standard_Failure::Caught(); cout <<"EXCEPTION in GeomTools_CurveSet::ReadCurve(..)!!!" << endl; cout << anExc << endl; diff --git a/src/GeomTools/GeomTools_SurfaceSet.cxx b/src/GeomTools/GeomTools_SurfaceSet.cxx index 5bb8c8f1f7..777a2cbf1e 100644 --- a/src/GeomTools/GeomTools_SurfaceSet.cxx +++ b/src/GeomTools/GeomTools_SurfaceSet.cxx @@ -1041,7 +1041,7 @@ Standard_IStream& GeomTools_SurfaceSet::ReadSurface(Standard_IStream& IS, } } catch(Standard_Failure) { -#ifdef DEB +#ifdef GEOMTOOLS_DEB Handle(Standard_Failure) anExc = Standard_Failure::Caught(); cout <<"EXCEPTION in GeomTools_SurfaceSet::ReadSurface(..)!!!" << endl; cout << anExc << endl; diff --git a/src/GeomliteTest/GeomliteTest_API2dCommands.cxx b/src/GeomliteTest/GeomliteTest_API2dCommands.cxx index e888078d51..e03e0938c4 100644 --- a/src/GeomliteTest/GeomliteTest_API2dCommands.cxx +++ b/src/GeomliteTest/GeomliteTest_API2dCommands.cxx @@ -282,7 +282,9 @@ static Standard_Integer intersect(Draw_Interpretor& di, Standard_Integer n, cons { if( n < 2) { +#ifdef GEOMLITETEST_DEB cout<< "2dintersect curve curve [Tol]"<0) { Variation.SetWithMinMax(Standard_True);} Variation.Approximate(); -# ifdef DEB +# ifdef GEOMLITETEST_DEB //Variation.Dump(cout); Standard_SStream aSStream; Variation.Dump(aSStream); @@ -464,7 +464,7 @@ static Standard_Integer smoothing (Draw_Interpretor& di,Standard_Integer n, cons Variation.SetTolerance( Abs(Tolerance)); if (Tolerance>0) { Variation.SetWithMinMax(Standard_True);} Variation.Approximate(); -# ifdef DEB +# ifdef GEOMLITETEST_DEB //Variation.Dump(cout); Standard_SStream aSStream; Variation.Dump(aSStream); diff --git a/src/Graphic3d/Graphic3d_TextureRoot.cxx b/src/Graphic3d/Graphic3d_TextureRoot.cxx index bbef8faaf6..0df6616415 100644 --- a/src/Graphic3d/Graphic3d_TextureRoot.cxx +++ b/src/Graphic3d/Graphic3d_TextureRoot.cxx @@ -56,8 +56,10 @@ TCollection_AsciiString Graphic3d_TextureRoot::TexturesFolder() if (VarName.IsEmpty()) { +#ifdef GRAPHIC3D_DEB std::cerr << "Both environment variables CSF_MDTVTexturesDirectory and CASROOT are undefined!\n" << "At least one should be defined to use standard Textures.\n"; +#endif Standard_Failure::Raise ("CSF_MDTVTexturesDirectory and CASROOT are undefined"); return VarName; } @@ -68,8 +70,10 @@ TCollection_AsciiString Graphic3d_TextureRoot::TexturesFolder() OSD_File aTextureFile (aTexture); if (!aDir.Exists() || !aTextureFile.Exists()) { +#ifdef GRAPHIC3D_DEB std::cerr << " CSF_MDTVTexturesDirectory or CASROOT not correctly setted\n"; std::cerr << " not all files are found in : "<< VarName.ToCString() << std::endl; +#endif Standard_Failure::Raise ("CSF_MDTVTexturesDirectory or CASROOT not correctly setted"); return VarName; } diff --git a/src/HLRBRep/HLRBRep_Data.cxx b/src/HLRBRep/HLRBRep_Data.cxx index 8b262127a3..a36948b152 100644 --- a/src/HLRBRep/HLRBRep_Data.cxx +++ b/src/HLRBRep/HLRBRep_Data.cxx @@ -200,7 +200,7 @@ public: } //-- ============================================================ void SetDim(const Standard_Integer n) { -#ifdef DEB +#ifdef HLRBREP_DEB cout<<"\n@#@#@#@#@# SetDim "< param + tolpar) Loop = Standard_False; else { -#ifdef DEB +#ifdef HLRBREP_DEB cout << "HLRBRep_Data::HidingStartLevel : "; cout << "Bad Parameter." << endl; #endif @@ -1621,12 +1621,10 @@ TopAbs_State HLRBRep_Data::Compare (const Standard_Integer E, //======================================================================= -#ifdef DEB Standard_Boolean HLRBRep_Data::OrientOutLine (const Standard_Integer I, HLRBRep_FaceData& FD) -#else -Standard_Boolean HLRBRep_Data::OrientOutLine (const Standard_Integer, HLRBRep_FaceData& FD) -#endif { + (void)I; // avoid compiler warning + const Handle(HLRAlgo_WiresBlock)& wb = FD.Wires(); Standard_Integer nw = wb->NbWires(); Standard_Integer iw1,ie1,ne1; @@ -1678,7 +1676,7 @@ Standard_Boolean HLRBRep_Data::OrientOutLine (const Standard_Integer, HLRBRep_Fa (iFaceGeom,pu,pv,V); gp_Vec Nm = mySLProps.Normal(); if (curv == 0) { -#ifdef DEB +#ifdef HLRBREP_DEB cout << "HLRBRep_Data::OrientOutLine " << I; cout << " Edge " << myFE << " : "; cout << "CurvatureValue == 0." << endl; @@ -1691,7 +1689,7 @@ Standard_Boolean HLRBRep_Data::OrientOutLine (const Standard_Integer, HLRBRep_Fa Nm.Transform(T); Nm.Cross(Tg); if (Tg.Magnitude() < gp::Resolution()) { -#ifdef DEB +#ifdef HLRBREP_DEB cout << "HLRBRep_Data::OrientOutLine " << I; cout << " Edge " << myFE << " : "; cout << "Tg.Magnitude() == 0." << endl; @@ -1713,7 +1711,7 @@ Standard_Boolean HLRBRep_Data::OrientOutLine (const Standard_Integer, HLRBRep_Fa eb1->Orientation(ie1,myFEOri); } else { -#ifdef DEB +#ifdef HLRBREP_DEB cout << "HLRBRep_Data::OrientOutLine " << I; cout << " Edge " << myFE << " : "; cout << "UVPoint not found, OutLine not Oriented" << endl; diff --git a/src/HLRBRep/HLRBRep_PolyAlgo.cxx b/src/HLRBRep/HLRBRep_PolyAlgo.cxx index f3514323b8..354e78a52f 100644 --- a/src/HLRBRep/HLRBRep_PolyAlgo.cxx +++ b/src/HLRBRep/HLRBRep_PolyAlgo.cxx @@ -1280,7 +1280,7 @@ InitBiPointsWithConnexity (const Standard_Integer e, ZTI2 = Z2 = Nod12PntZ; if (Nod12Edg1 == (Standard_Boolean) e) U2 = Nod12PCu1; else if (Nod12Edg2 == (Standard_Boolean) e) U2 = Nod12PCu2; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : "; cout << "Parameter error on Node " << i1p2 << endl; @@ -1332,7 +1332,7 @@ InitBiPointsWithConnexity (const Standard_Integer e, ZTI2 = Z2 = Nod12PntZ; if (Nod12Edg1 == (Standard_Boolean) e) U2 = Nod12PCu1; else if (Nod12Edg2 == (Standard_Boolean) e) U2 = Nod12PCu2; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : "; cout << "Parameter error on Node " << i1p2 << endl; @@ -1450,7 +1450,7 @@ InitBiPointsWithConnexity (const Standard_Integer e, ZTI2 = Z2 = Nod12PntZ; if (Nod12Edg1 == (Standard_Boolean) e) U2 = Nod12PCu1; else if (Nod12Edg2 == (Standard_Boolean) e) U2 = Nod12PCu2; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::InitBiPointsWithConnexity : "; cout << "Parameter error on Node " << i1p2 << endl; @@ -1899,7 +1899,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List, Nod11PntZ = Z3; if (Nod11Edg1 == (Standard_Boolean) e) Nod11PCu1 = U3; else if (Nod11Edg2 == (Standard_Boolean) e) Nod11PCu2 = U3; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : "; cout << "Parameter error on Node " << i1p1 << endl; @@ -1937,7 +1937,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List, Nod12PntZ = Z3; if (Nod12Edg1 == (Standard_Boolean) e) Nod12PCu1 = U3; else if (Nod12Edg2 == (Standard_Boolean) e) Nod12PCu2 = U3; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : "; cout << "Parameter error on Node " << i1p2 << endl; @@ -2062,7 +2062,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List, Nod11PntZ = Z3; if (Nod11Edg1 == (Standard_Boolean) e) Nod11PCu1 = U3; else if (Nod11Edg2 == (Standard_Boolean) e) Nod11PCu2 = U3; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : "; cout << "Parameter error on Node " << i1p1 << endl; @@ -2076,7 +2076,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List, Nod21PntZ = Z3; if (Nod21Edg1 == (Standard_Boolean) e) Nod21PCu1 = U3; else if (Nod21Edg2 == (Standard_Boolean) e) Nod21PCu2 = U3; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : "; cout << "Parameter error on Node " << i2p1 << endl; @@ -2119,7 +2119,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List, Nod12PntZ = Z3; if (Nod12Edg1 == (Standard_Boolean) e) Nod12PCu1 = U3; else if (Nod12Edg2 == (Standard_Boolean) e) Nod12PCu2 = U3; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : "; cout << "Parameter error on Node " << i1p2 << endl; @@ -2133,7 +2133,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List, Nod22PntZ = Z3; if (Nod22Edg1 == (Standard_Boolean) e) Nod22PCu1 = U3; else if (Nod22Edg2 == (Standard_Boolean) e) Nod22PCu2 = U3; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : "; cout << "Parameter error on Node " << i2p2 << endl; @@ -2283,7 +2283,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List, Nod11PntZ = Z3; if (Nod11Edg1 == (Standard_Boolean) e) Nod11PCu1 = U3; else if (Nod11Edg2 == (Standard_Boolean) e) Nod11PCu2 = U3; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : "; cout << "Parameter error on Node " << i1p1 << endl; @@ -2297,7 +2297,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List, Nod21PntZ = Z3; if (Nod21Edg1 == (Standard_Boolean) e) Nod21PCu1 = U3; else if (Nod21Edg2 == (Standard_Boolean) e) Nod21PCu2 = U3; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : "; cout << "Parameter error on Node " << i2p1 << endl; @@ -2340,7 +2340,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List, Nod12PntZ = Z4; if (Nod12Edg1 == (Standard_Boolean) e) Nod12PCu1 = U4; else if (Nod12Edg2 == (Standard_Boolean) e) Nod12PCu2 = U4; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : "; cout << "Parameter error on Node " << i1p2 << endl; @@ -2354,7 +2354,7 @@ MoveOrInsertPoint (HLRAlgo_ListOfBPoint& List, Nod22PntZ = Z4; if (Nod22Edg1 == (Standard_Boolean) e) Nod22PCu1 = U4; else if (Nod22Edg2 == (Standard_Boolean) e) Nod22PCu2 = U4; -#ifdef DEB +#ifdef HLRBREP_DEB else { cout << " HLRBRep_PolyAlgo::MoveOrInsertPoint : "; cout << "Parameter error on Node " << i2p2 << endl; diff --git a/src/IFSelect/IFSelect_Activator.cxx b/src/IFSelect/IFSelect_Activator.cxx index 2e21990fa5..4f7d762212 100644 --- a/src/IFSelect/IFSelect_Activator.cxx +++ b/src/IFSelect/IFSelect_Activator.cxx @@ -42,7 +42,7 @@ static Handle(IFSelect_Profile) thealiases; if (thedico.IsNull()) thedico = new Dico_DictionaryOfInteger; Standard_Integer& num = thedico->NewItem(command,deja,Standard_True); if (deja) { -#ifdef DEB +#ifdef IFSELECT_DEB cout<<"**** XSTEP commands, name conflict on "<Color() ); if ( color.IsNull() ) { -#ifdef DEB +#ifdef IGESCAFCONTROL_DEB cout << "Error: Unrecognized type of color definition" << endl; #endif IsColor = Standard_False; diff --git a/src/IGESCAFControl/IGESCAFControl_Writer.cxx b/src/IGESCAFControl/IGESCAFControl_Writer.cxx index 3c7ab22805..6b979b9e0c 100644 --- a/src/IGESCAFControl/IGESCAFControl_Writer.cxx +++ b/src/IGESCAFControl/IGESCAFControl_Writer.cxx @@ -368,11 +368,8 @@ static void AttachLayer (const Handle(Transfer_FinderProcess) &FP, Handle(TransferBRep_ShapeMapper) mapper = TransferBRep::ShapeMapper ( FP, localShape ); if ( FP->FindTypedTransient ( mapper, STANDARD_TYPE(IGESData_IGESEntity), Igesent ) ) { Igesent->InitLevel( 0, localIntName ); -// #ifdef DEB -// cout << "Init layer " << localIntName << " for "<< localShape.TShape()->DynamicType()->Name() << endl; -// #endif } -#ifdef DEB +#ifdef IGESCAFCONTROL_DEB else cout << "Warning: Can't find entity for shape in mapper" << endl; #endif } diff --git a/src/IGESControl/IGESControl_IGESBoundary.cxx b/src/IGESControl/IGESControl_IGESBoundary.cxx index 6ab50c9b06..41fe464281 100644 --- a/src/IGESControl/IGESControl_IGESBoundary.cxx +++ b/src/IGESControl/IGESControl_IGESBoundary.cxx @@ -305,7 +305,7 @@ static Standard_Boolean Connect (const Handle(ShapeAnalysis_Wire)& theSAW, TopoDS_Edge edge3d = Lsewd3d->Edge (iedge), edge2d = Lsewd2d->Edge (iedge); if (!IGESToBRep::TransferPCurve (edge2d, edge3d, myface)) continue; if (sfe->FixReversed2d (edge3d, myface)) { -#ifdef DEB +#ifdef IGESCONTROL_DEB cout << "Warning: IGESToBRep_IGESBoundary: 2D curve of edge was reversed" << endl; #endif } @@ -325,19 +325,19 @@ static Standard_Boolean Connect (const Handle(ShapeAnalysis_Wire)& theSAW, Standard_Real maxdev = BRep_Tool::Tolerance (edge3d); //pdn 08.04.99 S4135 recomputing only if deviation is greater than maxtol if (maxdev > maxtol) { //:e2 -#ifdef DEB +#ifdef IGESCONTROL_DEB cout << "Warning: IGESToBRep_IGESBoundary: Deviation = " << maxdev << endl; #endif ShapeFix_ShapeTolerance().SetTolerance (edge3d, Precision::Confusion()); for (Standard_Integer ie = 1; ie <= iedge; ie++) ShapeBuild_Edge().RemovePCurve (Lsewd3d->Edge (ie), myface); if (Preferred3d) { -#ifdef DEB +#ifdef IGESCONTROL_DEB cout << "Warning: IGESToBRep_IGESBoundary: 3D and 2D curves are inconsistent; 2D is ignored" << endl; #endif } else { -#ifdef DEB +#ifdef IGESCONTROL_DEB cout << "Warning: IGESToBRep_IGESBoundary: 3D and 2D curves are inconsistent; 3D is ignored" << endl; #endif Lsewd = Lsewd2d; @@ -348,7 +348,7 @@ static Standard_Boolean Connect (const Handle(ShapeAnalysis_Wire)& theSAW, } okCurve = okCurve && ShapeAlgo::AlgoContainer()->ConnectNextWire (saw, Lsewd, maxtol, distmin, revsewd, revnextsewd); if (!okCurve) { -#ifdef DEB +#ifdef IGESCONTROL_DEB cout << "Warning: IGESToBRep_IGESBoundary: Curves " << i - 1 << " and " << i << " cannot be connected" << endl; #endif Gsewd3d = new ShapeExtend_WireData; diff --git a/src/IGESControl/IGESControl_Writer.cxx b/src/IGESControl/IGESControl_Writer.cxx index e71a7c9f66..58fbfbd516 100644 --- a/src/IGESControl/IGESControl_Writer.cxx +++ b/src/IGESControl/IGESControl_Writer.cxx @@ -245,7 +245,7 @@ Standard_Boolean IGESControl_Writer::Write if (!S) return Standard_False; ComputeModel(); Standard_Integer nbEnt = themod->NbEntities(); -#ifdef DEBUG +#ifdef IGESCONTROL_DEB cout<<" IGES Write : "<TypeNumber(); if (it == 112 || it == 126) { thefound = Standard_True; -#ifdef DEB +#ifdef IGESSELECT_DEB cout<<"IGESSelect_SplineToBSpline : n0."<Print(cout); #endif diff --git a/src/IGESToBRep/IGESToBRep_BasicCurve.cxx b/src/IGESToBRep/IGESToBRep_BasicCurve.cxx index a2458600fc..1cebe99929 100644 --- a/src/IGESToBRep/IGESToBRep_BasicCurve.cxx +++ b/src/IGESToBRep/IGESToBRep_BasicCurve.cxx @@ -230,7 +230,7 @@ Handle(Geom_Curve) IGESToBRep_BasicCurve::TransferBasicCurve } //:36 catch(Standard_Failure) { -#ifdef DEB +#ifdef IGESTOBREP_DEB cout << "\n** Exception in IGESToBRep_BasicCurve::TransferBasicCurve : "; Standard_Failure::Caught()->Print(cout); #endif @@ -293,7 +293,7 @@ Handle(Geom2d_Curve) IGESToBRep_BasicCurve::Transfer2dBasicCurve } } //:h8 catch(Standard_Failure) { -#ifdef DEB +#ifdef IGESTOBREP_DEB cout << "\n** Exception in IGESToBRep_BasicCurve::Transfer2dBasicCurve : "; Standard_Failure::Caught()->Print(cout); #endif @@ -1101,7 +1101,7 @@ Handle(Geom_Curve) IGESToBRep_BasicCurve::TransferBSplineCurve BSplineRes = new Geom_BSplineCurve(Poles, Weight, Knot, Mult, Degree); } catch(Standard_Failure) { -#ifdef DEB +#ifdef IGESTOBREP_DEB cout << "\n** Exception in IGESToBRep_BasicCurve::TransferBSplineCurve during creation of Geom_BSplineCurve : "; Standard_Failure::Caught()->Print(cout); #endif diff --git a/src/IGESToBRep/IGESToBRep_BasicSurface.cxx b/src/IGESToBRep/IGESToBRep_BasicSurface.cxx index e01ac341c9..b3d001bcd9 100644 --- a/src/IGESToBRep/IGESToBRep_BasicSurface.cxx +++ b/src/IGESToBRep/IGESToBRep_BasicSurface.cxx @@ -221,7 +221,7 @@ Handle(Geom_Surface) IGESToBRep_BasicSurface::TransferBasicSurface } //:36 catch(Standard_Failure) { -#ifdef DEB +#ifdef IGESTOBREP_DEB cout << "\n** Exception in IGESToBRep_BasicSurface::TransferBasicSurface : "; Standard_Failure::Caught()->Print(cout); #endif diff --git a/src/IGESToBRep/IGESToBRep_TopoSurface.cxx b/src/IGESToBRep/IGESToBRep_TopoSurface.cxx index 114e6c818c..6a512e8caa 100644 --- a/src/IGESToBRep/IGESToBRep_TopoSurface.cxx +++ b/src/IGESToBRep/IGESToBRep_TopoSurface.cxx @@ -798,7 +798,7 @@ TopoDS_Shape IGESToBRep_TopoSurface::TransferSurfaceOfRevolution } catch (Standard_Failure) { -#ifdef DEB +#ifdef IGESTOBREP_DEB cout << "Warning: IgesToBRep_TopoSurface::" "TransferSurfaceOfRevolution(): exception by Geom: "; Standard_Failure::Caught()->Print ( cout ); cout << endl; @@ -930,7 +930,7 @@ TopoDS_Shape IGESToBRep_TopoSurface::TransferTabulatedCylinder } } catch (Standard_Failure) { -#ifdef DEB +#ifdef IGESTOBREP_DEB cout << "Warning: IgesToBRep_TopoSurface::TransferTabulatedCylinder(): exception by Geom: "; Standard_Failure::Caught()->Print ( cout ); cout << endl; #endif @@ -1284,7 +1284,7 @@ TopoDS_Shape IGESToBRep_TopoSurface::TransferBoundedSurface if (myshape.IsNull()) { //#55 rln 24.12.98 UKI60878 entity D593 -#ifdef DEB +#ifdef IGESTOBREP_DEB cout << "Fail: IGESToBRep_TopoSurface::TransferBoundedSurface UntrimmedSurface is translated into Null" << endl; #endif return res; diff --git a/src/Image/Image_AlienPixMap.cxx b/src/Image/Image_AlienPixMap.cxx index e1bf762eaf..81be6cc0db 100644 --- a/src/Image/Image_AlienPixMap.cxx +++ b/src/Image/Image_AlienPixMap.cxx @@ -378,7 +378,9 @@ bool Image_AlienPixMap::Save (const TCollection_AsciiString& theFileName) #endif if (anImageFormat == FIF_UNKNOWN) { +#ifdef IMAGE_DEB std::cerr << "Image_PixMap, image format doesn't supported!\n"; +#endif return false; } @@ -521,7 +523,9 @@ bool Image_AlienPixMap::Save (const TCollection_AsciiString& theFileName) { return savePPM (theFileName); } +#ifdef IMAGE_DEB std::cerr << "Image_PixMap, no image library available! Image saved in PPM format.\n"; +#endif return savePPM (theFileName); #endif } diff --git a/src/Image/Image_Diff.cxx b/src/Image/Image_Diff.cxx index 81eca33026..9c97804904 100644 --- a/src/Image/Image_Diff.cxx +++ b/src/Image/Image_Diff.cxx @@ -166,18 +166,24 @@ Standard_Boolean Image_Diff::Init (const Handle(Image_PixMap)& theImageRef, || theImageRef->SizeY() != theImageNew->SizeY() || theImageRef->Format() != theImageNew->Format()) { +#ifdef IMAGE_DEB std::cerr << "Images has different format or dimensions\n"; +#endif return Standard_False; } else if (!isSupportedFormat (theImageRef->Format())) { +#ifdef IMAGE_DEB std::cerr << "Images has unsupported pixel format\n"; +#endif return Standard_False; } else if (theImageRef->SizeX() >= 0xFFFF || theImageRef->SizeY() >= 0xFFFF) { +#ifdef IMAGE_DEB std::cerr << "Image too large\n"; +#endif return Standard_False; } @@ -223,7 +229,9 @@ Standard_Boolean Image_Diff::Init (const TCollection_AsciiString& theImgPathRef, if (!anImgRef->Load (theImgPathRef) || !anImgNew->Load (theImgPathNew)) { +#ifdef IMAGE_DEB std::cerr << "Failed to load image(s) file(s)\n"; +#endif return Standard_False; } return Init (anImgRef, anImgNew, theToBlackWhite); diff --git a/src/IntCurveSurface/IntCurveSurface_Inter.gxx b/src/IntCurveSurface/IntCurveSurface_Inter.gxx index c99376a265..5418b7a9fb 100644 --- a/src/IntCurveSurface/IntCurveSurface_Inter.gxx +++ b/src/IntCurveSurface/IntCurveSurface_Inter.gxx @@ -1814,7 +1814,7 @@ void ProjectIntersectAndEstLim(const gp_Lin& theLine, { ProjLib_Plane aLineProj( thePln, theLine ); if (!aLineProj.IsDone()) { -#ifdef DEB +#ifdef INTCURVESURFACE_DEB cout << "Info: IntCurveSurface_Inter::ProjectIntersectAndEstLim(), !aLineProj.IsDone()" << endl; @@ -1941,7 +1941,7 @@ void EstLimForInfRevl(const gp_Lin& Line, return; // not infinite curve } if (!aBasCurvProj.IsDone()) { -#ifdef DEB +#ifdef INTCURVESURFACE_DEB cout << "Info: IntCurveSurface_Inter::EstLimForInfRevl(), !aBasCurvProj.IsDone()" << endl; #endif return; diff --git a/src/IntCurveSurface/IntCurveSurface_Polygon.gxx b/src/IntCurveSurface/IntCurveSurface_Polygon.gxx index 20d03e05bf..305a1ea395 100644 --- a/src/IntCurveSurface/IntCurveSurface_Polygon.gxx +++ b/src/IntCurveSurface/IntCurveSurface_Polygon.gxx @@ -194,16 +194,20 @@ Standard_Real IntCurveSurface_Polygon::ApproxParamOnCurve(const Standard_Integer { //ddout << "IntCurveSurface_Polygon::ApproxParamOnCurve" << endl; if(TheParamOnLine < 0.0 || TheParamOnLine >1.0) { +#ifdef INTCURVESURFACE_DEB cout<<" ParamOnLine = "< NbPntIn) { cout << "OutOfRange Polygon::ApproxParamOnCurve " <Vertex(iv2).*pParOnArc)() : paramsResolved(iv2)); -#ifdef DEB +#ifdef INTPATCH_DEB cout<<"****** Parameters on arc on S"<ComputeVertexParameters(Tol, hasBeenAdded); } else { -#ifdef DEB - //if(rlin->NbVertex()==0) { - // cout<<" \n *** IntPatch RstInt.gxx : nbvtx = 0 sur rline *** \n"<ComputeVertexParameters(Tol); } } diff --git a/src/IntWalk/IntWalk_IWalking_2.gxx b/src/IntWalk/IntWalk_IWalking_2.gxx index fa8544421e..6fff448f19 100644 --- a/src/IntWalk/IntWalk_IWalking_2.gxx +++ b/src/IntWalk/IntWalk_IWalking_2.gxx @@ -677,7 +677,7 @@ void IntWalk_IWalking::TestArretCadre } Line->SetTangentVector(previousd3d,j-1); } -#ifdef DEB +#ifdef INTWALK_DEB else { cout<<" IntWalk_IWalking_2.gxx : bizarrerie 30 10 97 "<Upper()) { -#ifdef DEB +#ifdef MDF_DEB cout<<"MDF_Tool::WriteLabels LABEL array resizing from "<Upper()<<" to "<Upper()) { -#ifdef DEB +#ifdef MDF_DEB cout<<"MDF_Tool::WriteLabels ATTRIBUTES array resizing from "<Upper()<<" to "<Width() != -1. ) T->SetWidth( S->Width() ); else T->UnsetWidth(); -#ifdef DEB +#ifdef MPRSSTD_DEB cout << "AISPresentationRetrievalDriver " << "retrieved DriverGUID ==> "; guid.ShallowDump(cout); cout << endl; diff --git a/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver_1.cxx b/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver_1.cxx index 783b4d7b79..8a7272c953 100644 --- a/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver_1.cxx +++ b/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver_1.cxx @@ -70,7 +70,7 @@ void MPrsStd_AISPresentationRetrievalDriver_1::Paste(const Handle(PDF_Attribute) T->SetMode(S->Mode()); -#ifdef DEB +#ifdef MPRSSTD_DEB cout << "AISPresentationRetrievalDriver " << "retrieved DriverGUID ==> "; guid.ShallowDump(cout); cout << endl; diff --git a/src/MPrsStd/MPrsStd_AISPresentationStorageDriver.cxx b/src/MPrsStd/MPrsStd_AISPresentationStorageDriver.cxx index 8ce0e31aa0..efb0eac85d 100644 --- a/src/MPrsStd/MPrsStd_AISPresentationStorageDriver.cxx +++ b/src/MPrsStd/MPrsStd_AISPresentationStorageDriver.cxx @@ -82,7 +82,7 @@ void MPrsStd_AISPresentationStorageDriver::Paste(const Handle(TDF_Attribute)& So T->SetMode(S->Mode()); -#ifdef DEB +#ifdef MPRSSTD_DEB cout << "AISPresentationStorageDriver " << "storaged DriverGUID ==> " << guid->Convert() << endl; #endif } diff --git a/src/MeshTest/MeshTest_CheckTopology.cxx b/src/MeshTest/MeshTest_CheckTopology.cxx index 8829f63ee3..d4e6075708 100644 --- a/src/MeshTest/MeshTest_CheckTopology.cxx +++ b/src/MeshTest/MeshTest_CheckTopology.cxx @@ -56,7 +56,7 @@ void MeshTest_CheckTopology::Perform (Draw_Interpretor& di) Handle(Poly_PolygonOnTriangulation) aPoly1 = BRep_Tool::PolygonOnTriangulation(aEdge, aT1, aLoc1); if (aPoly1.IsNull() || aT1.IsNull()) { -#ifdef DEB +#ifdef MESHTEST_DEB cout<<"problem getting PolygonOnTriangulation of edge "<d_name); // LD debug -#ifdef DEBUG +#ifdef OSD_DEB cout << "Place : " << myPlace << endl; cout << "FName : " << full_name << endl; #endif diff --git a/src/OSD/OSD_Path.cxx b/src/OSD/OSD_Path.cxx index 7550930b0e..fdee9b4356 100644 --- a/src/OSD/OSD_Path.cxx +++ b/src/OSD/OSD_Path.cxx @@ -360,7 +360,7 @@ OSD_Path::OSD_Path(const TCollection_AsciiString& aDependentName, MacExtract(aDependentName,myDisk,myTrek,myName,myExtension); break; default: -#ifdef DEB +#ifdef OSD_DEB cout << " WARNING WARNING : OSD Path for an Unknown SYSTEM : " << (Standard_Integer)todo << endl; #endif break ; diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx index 1a961800a9..5488cbc608 100644 --- a/src/OSD/OSD_signal.cxx +++ b/src/OSD/OSD_signal.cxx @@ -187,7 +187,9 @@ static void Handler (const int theSignal) if (aCurInfoHandle) { // cout << "OSD::Handler: calling previous signal handler with info " << aCurInfoHandle << endl ; (*aCurInfoHandle) (theSignal, aSigInfo, theContext); +#ifdef OSD_DEB cerr << " previous signal handler return" << endl ; +#endif return; } else { @@ -200,7 +202,9 @@ static void Handler (const int theSignal) if(aCurHandler) { // cout << "OSD::Handler: calling previous signal handler" << endl ; (*aCurHandler) (theSignal); +#ifdef OSD_DEB cerr << " previous signal handler return" << endl ; +#endif return; } } @@ -314,7 +318,9 @@ static void Handler (const int theSignal) Standard_DivideByZero::NewInstance("SIGTRAP IntegerDivideByZero")->Jump(); break; #endif default: +#ifdef OSD_DEB cout << "Unexpected signal " << theSignal << endl ; +#endif break; } } @@ -353,9 +359,11 @@ static void SegvHandler(const int theSignal, OSD_SIGSEGV::NewInstance(Msg)->Jump(); } } +#ifdef OSD_DEB else { cout << "Wrong undefined address." << endl ; } +#endif exit(SIGSEGV); } @@ -382,9 +390,11 @@ static void SegvHandler(const int theSignal, // scp->sc_pcoq_tail = scp->sc_pcoq_tail + 0x4 ; l'intruction suivant le segv. } } +#ifdef OSD_DEB else { cout << "Wrong undefined address." << endl ; } +#endif exit(SIGSEGV); } @@ -413,7 +423,9 @@ void OSD::SetSignal(const Standard_Boolean aFloatingSignal) //stat = ieee_handler("set", "inexact", PHandler) || stat; if (stat) { +#ifdef OSD_DEB cerr << "ieee_handler does not work !!! KO " << endl; +#endif } #elif defined (linux) feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW); @@ -430,9 +442,11 @@ void OSD::SetSignal(const Standard_Boolean aFloatingSignal) if ( first_time & 2 ) { char *TRAP_FPE = getenv("TRAP_FPE") ; if ( TRAP_FPE == NULL ) { +#ifdef OSD_DEB cout << "On SGI you must set TRAP_FPE environment variable : " << endl ; cout << "set env(TRAP_FPE) \"UNDERFL=FLUSH_ZERO;OVERFL=DEFAULT;DIVZERO=DEFAULT;INT_OVERFL=DEFAULT\" or" << endl ; cout << "setenv TRAP_FPE \"UNDERFL=FLUSH_ZERO;OVERFL=DEFAULT;DIVZERO=DEFAULT;INT_OVERFL=DEFAULT\"" << endl ; +#endif // exit(1) ; first_time = first_time & (~ 2) ; } @@ -458,7 +472,9 @@ void OSD::SetSignal(const Standard_Boolean aFloatingSignal) //==== Always detected the signal "SIGFPE" ================================= stat = sigaction(SIGFPE,&act,&oact); // ...... floating point exception if (stat) { +#ifdef OSD_DEB cerr << "sigaction does not work !!! KO " << endl; +#endif perror("sigaction "); } diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx index 54c225eb3e..02e402a317 100644 --- a/src/OpenGl/OpenGl_Context.cxx +++ b/src/OpenGl/OpenGl_Context.cxx @@ -497,7 +497,9 @@ Standard_Boolean OpenGl_Context::CheckExtension (const char* theExtName) const { if (theExtName == NULL) { +#ifdef OPENGL_DEB std::cerr << "CheckExtension called with NULL string!\n"; +#endif return Standard_False; } diff --git a/src/OpenGl/OpenGl_telem_util.cxx b/src/OpenGl/OpenGl_telem_util.cxx index 1935207710..a2595b327d 100644 --- a/src/OpenGl/OpenGl_telem_util.cxx +++ b/src/OpenGl/OpenGl_telem_util.cxx @@ -100,7 +100,7 @@ Tint TelGetPolygonNormal(tel_point pnts, Tint* indexs, Tint npnt, Tfloat *norm ) } } } -#ifdef DEB +#ifdef OPENGL_DEB if( !status ) printf(" *** OpenGl_TelGetPolygonNormal.has found confused or aligned points\n"); #endif @@ -121,7 +121,7 @@ Tint TelGetNormal(Tfloat *data1, Tfloat *data2, Tfloat *data3, Tfloat *norm ) { d = vecnrmd( norm, d ); status = (d > 0.) ? 1 : 0; } -#ifdef DEB +#ifdef OPENGL_DEB if( !status ) printf(" *** OpenGl_TelGetNormal.has found confused or aligned points\n"); #endif diff --git a/src/Poly/Poly.cxx b/src/Poly/Poly.cxx index 21235eebd5..70939f41e7 100644 --- a/src/Poly/Poly.cxx +++ b/src/Poly/Poly.cxx @@ -290,7 +290,9 @@ Handle(Poly_Triangulation) Poly::ReadTriangulation(Standard_IStream& IS) char line[100]; IS >> line; if (strcmp(line,"Poly_Triangulation")) { +#ifdef POLY_DEB cout << "Not a Triangulation in the file" << endl; +#endif return Handle(Poly_Triangulation)(); } @@ -354,7 +356,9 @@ Handle(Poly_Polygon3D) Poly::ReadPolygon3D(Standard_IStream& IS) char line[100]; IS >> line; if (strcmp(line,"Poly_Polygon3D")) { +#ifdef POLY_DEB cout << "Not a Polygon3D in the file" << endl; +#endif return Handle(Poly_Polygon3D)(); } @@ -407,7 +411,9 @@ Handle(Poly_Polygon2D) Poly::ReadPolygon2D(Standard_IStream& IS) char line[100]; IS >> line; if (strcmp(line,"Poly_Polygon2D")) { +#ifdef POLY_DEB cout << "Not a Polygon2D in the file" << endl; +#endif return Handle(Poly_Polygon2D)(); } diff --git a/src/ProjLib/ProjLib_CompProjectedCurve.cxx b/src/ProjLib/ProjLib_CompProjectedCurve.cxx index ba4f5e50c9..690e455efe 100644 --- a/src/ProjLib/ProjLib_CompProjectedCurve.cxx +++ b/src/ProjLib/ProjLib_CompProjectedCurve.cxx @@ -709,7 +709,7 @@ void ProjLib_CompProjectedCurve::Init() if(!ExactBound(Triple, t - Step, Tol, myTolU, myTolV, myCurve, mySurface)) { -#if DEB +#if PROJLIB_DEB cout<<"There is a problem with ExactBound computation"<RemoveKnot(ij,MaxDeg-1,Tol3d); //OCC217 //OK = OK && Dummy->RemoveKnot(ij,MaxDeg-1,myTolerance); } -#ifdef DEB +#ifdef PROJLIB_DEB if (!OK) { cout << "ProjLib_ComputeApproxOnPolarSurface : Smoothing echoue"<Orientation(); } else { -#ifdef DEB +#ifdef RWSTEPSHAPE_DEB cout << "EdgeLoop not referenced by FaceBound" << endl; #endif } @@ -226,14 +226,14 @@ void RWStepShape_RWEdgeCurve::Check } else { if (nbRef == 0) { -#ifdef DEB +#ifdef RWSTEPSHAPE_DEB cout << "OrientedEdge not referenced" << endl; #endif } else { if (aShto.NbTypedSharings(theOE1, STANDARD_TYPE(StepShape_EdgeLoop)) > 1) { -#ifdef DEB +#ifdef RWSTEPSHAPE_DEB cout << "OrientedEdge referenced more than once" << endl; #endif } @@ -245,7 +245,7 @@ void RWStepShape_RWEdgeCurve::Check Standard_Boolean sharOE2 = aShto.IsShared(theOE2); if(!sharOE2){ -#ifdef DEB +#ifdef RWSTEPSHAPE_DEB cout << "OrientedEdge2 not shared" <Orientation(); } else { -#ifdef DEB +#ifdef RWSTEPSHAPE_DEB cout << "EdgeLoop not referenced by FaceBound" << endl; #endif } diff --git a/src/RWStepShape/RWStepShape_RWFaceBound.cxx b/src/RWStepShape/RWStepShape_RWFaceBound.cxx index 342fa09f69..9802200f1a 100644 --- a/src/RWStepShape/RWStepShape_RWFaceBound.cxx +++ b/src/RWStepShape/RWStepShape_RWFaceBound.cxx @@ -124,7 +124,7 @@ void RWStepShape_RWFaceBound::Check Standard_Boolean sharOE2 = aShto.IsShared(theOE2); if(!sharOE2){ -#ifdef DEB +#ifdef RWSTEPSHAPE_DEB cout << "OrientedEdge2 not shared" <Orientation(); } else { -#ifdef DEB +#ifdef RWSTEPSHAPE_DEB cout << "EdgeLoop not referenced by FaceBound" << endl; #endif } @@ -173,7 +173,7 @@ void RWStepShape_RWFaceBound::Check } //end for(i=1; i<=nbEdg; ...) } //end if(!theEL1.IsNull) else { -#ifdef DEB +#ifdef RWSTEPSHAPE_DEB cout << "no EdgeLoop in FaceBound" << endl; #endif } diff --git a/src/RWStl/RWStl.cxx b/src/RWStl/RWStl.cxx index 39fe02b559..bd3be1ce8e 100644 --- a/src/RWStl/RWStl.cxx +++ b/src/RWStl/RWStl.cxx @@ -305,7 +305,7 @@ Handle(StlMesh_Mesh) RWStl::ReadFile (const OSD_Path& thePath, IsAscii = Standard_False; } } -#ifdef DEB +#ifdef RWSTL_DEB cout << (IsAscii ? "ascii\n" : "binary\n"); #endif file.Close(); @@ -436,7 +436,7 @@ Handle(StlMesh_Mesh) RWStl::ReadAscii (const OSD_Path& thePath, // skip header while (getc(file) != '\n'); -#ifdef DEB +#ifdef RWSTL_DEB cout << "start mesh\n"; #endif ReadMesh = new StlMesh_Mesh(); @@ -484,7 +484,7 @@ Handle(StlMesh_Mesh) RWStl::ReadAscii (const OSD_Path& thePath, if (++iTri % IND_THRESHOLD == 0) aPS.Next(); } -#ifdef DEB +#ifdef RWSTL_DEB cout << "end mesh\n"; #endif fclose(file); diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx index 57202a010a..2e9c928492 100644 --- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx @@ -498,14 +498,14 @@ Standard_Boolean STEPCAFControl_Reader::Transfer (STEPControl_Reader &reader, static Handle(TCollection_HAsciiString) ap214 = new TCollection_HAsciiString ( "STEP AP214" ); if ( ! format->IsSameString ( ap203, Standard_False ) && ! format->IsSameString ( ap214, Standard_False ) ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: STEPCAFControl_Reader::Transfer: Extern document is neither STEP AP203 nor AP214" << endl; #else continue; #endif } } -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB else cout << "Warning: STEPCAFControl_Reader::Transfer: Extern document format not defined" << endl; #endif @@ -515,7 +515,7 @@ Standard_Boolean STEPCAFControl_Reader::Transfer (STEPControl_Reader &reader, cout<<"filename="<GetLabel(); } } -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB if ( ! EF->GetLabel().IsNull() ) cout << "Warning: STEPCAFControl_Reader::AddShape: Non-empty shape with external ref; ref is ignored" << endl; else if ( nbComponents <=0 ) @@ -707,7 +707,7 @@ Handle(STEPCAFControl_ExternFile) STEPCAFControl_Reader::ReadExternFile (const S return myFiles->Item ( file ); } -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Reading extern file: " << fullname << endl; #endif @@ -788,7 +788,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadColors (const Handle(XSControl_WorkS { STEPConstruct_Styles Styles ( WS ); if ( ! Styles.LoadStyles() ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: no styles are found in the model" << endl; #endif return Standard_False; @@ -963,7 +963,7 @@ TDF_Label STEPCAFControl_Reader::FindInstance (const Handle(StepRepr_NextAssembl Handle(Transfer_TransientProcess) TP = Tool.TransientProcess(); Handle(Transfer_Binder) binder = TP->Find(NAUO); if ( binder.IsNull() || ! binder->HasResult() ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Error: STEPCAFControl_Reader::FindInstance: NAUO is not mapped to shape" << endl; #endif return L; @@ -971,7 +971,7 @@ TDF_Label STEPCAFControl_Reader::FindInstance (const Handle(StepRepr_NextAssembl TopoDS_Shape S = TransferBRep::ShapeResult ( TP, binder ); if ( S.IsNull() ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Error: STEPCAFControl_Reader::FindInstance: NAUO is not mapped to shape" << endl; #endif return L; @@ -1149,7 +1149,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadValProps (const Handle(XSControl_Wor TColStd_SequenceOfTransient props; STEPConstruct_ValidationProps Props ( WS ); if ( ! Props.LoadProps ( props ) ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: no validation props found in the model" << endl; #endif return Standard_False; @@ -1310,7 +1310,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadLayers (const Handle(XSControl_WorkS Interface_EntityIterator subs = WS->Graph().Sharings(SVPLA); for (subs.Start(); subs.More(); subs.Next()) { if ( ! subs.Value()->IsKind(STANDARD_TYPE(StepVisual_Invisibility)) ) continue; -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout<< "\tLayer \"" << aLayerName << "\" is invisible"<FindLayer(aLayerName); @@ -1387,7 +1387,7 @@ static TDF_Label setSHUOintoDoc (const Handle(XSControl_WorkSession) &WS, Handle(StepRepr_NextAssemblyUsageOccurrence) NUNAUO = Handle(StepRepr_NextAssemblyUsageOccurrence)::DownCast(SHUO->NextUsage()); if ( UUNAUO.IsNull() || NUNAUO.IsNull() ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: " << __FILE__ <<": Upper_usage or Next_usage of styled SHUO is null. Skip it" << endl; #endif return aMainLabel; @@ -1446,7 +1446,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadSHUOs (const Handle(XSControl_WorkSe STEPConstruct_Styles Styles ( WS ); if ( ! Styles.LoadStyles() ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: no styles are found in the model" << endl; #endif return Standard_False; @@ -1466,7 +1466,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadSHUOs (const Handle(XSControl_WorkSe if ( style != aHSeqOfInvisStyle->Value( si ) ) continue; // found that current style is invisible. -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: item No " << i << "(" << style->Item()->DynamicType()->Name() << ") is invisible" << endl; #endif IsVisible = Standard_False; @@ -1505,7 +1505,7 @@ Standard_Boolean STEPCAFControl_Reader::ReadSHUOs (const Handle(XSControl_WorkSe // set the SHUO structure to the document TDF_Label aLabelForStyle = setSHUOintoDoc( WS, SHUO, STool, PDFileMap, ShapeLabelMap ); if ( aLabelForStyle.IsNull() ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: " << __FILE__ <<": coudnot create SHUO structure in the document" << endl; #endif continue; diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx index 1b8c342ddb..74820314ca 100644 --- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx @@ -267,7 +267,7 @@ IFSelect_ReturnStatus STEPCAFControl_Writer::Write (const Standard_CString filen // construct extern file name TCollection_AsciiString fname = OSD_Path::AbsolutePath ( dpath, EF->GetName()->String() ); if ( fname.Length() <= 0 ) fname = EF->GetName()->String(); -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Writing external file: " << fname.ToCString() << endl; #endif @@ -418,9 +418,6 @@ Standard_Boolean STEPCAFControl_Writer::Transfer (STEPControl_Writer &writer, Handle(STEPCAFControl_ActorWrite)::DownCast ( writer.WS()->NormAdaptor()->ActorWrite() ); // translate free top-level shapes of the DECAF document -#ifdef DEB // includes Transfer_ActorOfFinderProcess -// cout << "Actor is " << writer.WS()->NormAdaptor()->ActorWrite()->DynamicType()->Name() << endl; -#endif Standard_Integer ap = Interface_Static::IVal ("write.step.schema"); TDF_LabelSequence sublabels; for ( Standard_Integer i=1; i <= labels.Length(); i++ ) { @@ -694,7 +691,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteExternRefs (const Handle(XSControl_ Handle(StepShape_ShapeDefinitionRepresentation) SDR; Handle(TransferBRep_ShapeMapper) mapper = TransferBRep::ShapeMapper ( FP, S ); if ( ! FP->FindTypedTransient ( mapper, STANDARD_TYPE(StepShape_ShapeDefinitionRepresentation), SDR ) ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: Cannot find SDR for " << S.TShape()->DynamicType()->Name() << endl; #endif continue; @@ -706,7 +703,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteExternRefs (const Handle(XSControl_ StepRepr_RepresentedDefinition RD = SDR->Definition(); Handle(StepRepr_PropertyDefinition) aPropDef = RD.PropertyDefinition(); if (aPropDef.IsNull()) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: STEPCAFControl_Writer::WriteExternRefs StepRepr_PropertyDefinition is null for " << S.TShape()->DynamicType()->Name() << endl; #endif continue; @@ -714,7 +711,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteExternRefs (const Handle(XSControl_ StepRepr_CharacterizedDefinition CharDef = aPropDef->Definition(); Handle(StepBasic_ProductDefinition) PD = CharDef.ProductDefinition(); if (PD.IsNull()) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: STEPCAFControl_Writer::WriteExternRefs StepBasic_ProductDefinition is null for " << S.TShape()->DynamicType()->Name() << endl; #endif continue; @@ -943,7 +940,7 @@ static void MakeSTEPStyles (STEPConstruct_Styles &Styles, TopLoc_Location L; TColStd_SequenceOfTransient seqRI; Standard_Integer nb = FindEntities ( Styles.FinderProcess(), S, L, seqRI ); -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB if ( nb <=0 ) cout << "Warning: Cannot find RI for " << S.TShape()->DynamicType()->Name() << endl; #endif //Get overridden style gka 10.06.03 @@ -1037,7 +1034,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteColors (const Handle(XSControl_Work // Skip assemblies: colors assigned to assemblies and their instances // are not supported (it is not clear how to encode that in STEP) if ( XCAFDoc_ShapeTool::IsAssembly ( L ) ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: Cannot write color for Assembly" << endl; cout << "Info: Check for colors assigned to components in assembly" << endl; #endif @@ -1119,7 +1116,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteColors (const Handle(XSControl_Work if (!isComponent) { if ( myMapCompMDGPR.IsBound( aTopSh )) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cerr << "Error: Current Top-Level shape have MDGPR already " << endl; #endif } @@ -1233,7 +1230,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteNames (const Handle(XSControl_WorkS Handle(StepShape_ShapeDefinitionRepresentation) SDR; Handle(TransferBRep_ShapeMapper) mapper = TransferBRep::ShapeMapper ( FP, S ); if ( ! FP->FindTypedTransient ( mapper, STANDARD_TYPE(StepShape_ShapeDefinitionRepresentation), SDR ) ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: Cannot find SDR for " << S.TShape()->DynamicType()->Name() << endl; #endif continue; @@ -1481,7 +1478,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteLayers (const Handle(XSControl_Work Standard_Boolean isLinv = Standard_False; if (L.FindAttribute(XCAFDoc::InvisibleGUID(), aUAttr)) { descr = new TCollection_HAsciiString ("invisible"); -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB FP->Messenger() << "\tLayer \"" << hName->String().ToCString() << "\" is invisible"< 0) { // store SHUO recursive -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB if ( aNextUsageLabs.Length() > 1 ) cout << "Warning: store only one next_usage of current SHUO" << endl; #endif @@ -1669,7 +1666,7 @@ static Standard_Boolean writeSHUO (const Handle(XCAFDoc_GraphNode)& theSHUO, Handle(StepRepr_NextAssemblyUsageOccurrence) UUNAUO, NUNAUO; if (!getProDefinitionOfNAUO( WS, aUUSh, nullPD, UUNAUO, Standard_True ) || !getProDefinitionOfNAUO( WS, aNUSh, aRelatedPD, NUNAUO, Standard_False )) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: cannot get related or relating PD" << endl; #endif return Standard_False; @@ -1753,7 +1750,7 @@ static Standard_Boolean createSHUOStyledItem (const XCAFPrs_Style& style, TopLoc_Location L; TColStd_SequenceOfTransient seqRI; FindEntities ( FP, Sh, L, seqRI ); -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB if ( seqRI.Length() <=0 ) FP->Messenger() << "Warning: Cannot find RI for " << Sh.TShape()->DynamicType()->Name() << endl; #endif @@ -1770,7 +1767,7 @@ static Standard_Boolean createSHUOStyledItem (const XCAFPrs_Style& style, // do it by additing styled item to the MDGPR if ( !aTopSh.IsNull() && !myMapCompMDGPR.IsBound( aTopSh ) ) { // create MDGPR and record it in model -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: " << __FILE__ << ": Create new MDGPR for SHUO instance" << endl; #endif Handle(StepVisual_MechanicalDesignGeometricPresentationRepresentation) aMDGPR; @@ -1801,7 +1798,7 @@ static Standard_Boolean createSHUOStyledItem (const XCAFPrs_Style& style, } else { WS->Model()->AddWithRefs ( STEPstyle ); // add as root to the model, but it is not good -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: " << __FILE__ << ": adds styled item of SHUO as root, casue cannot find MDGPR" << endl; #endif } @@ -1878,7 +1875,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteSHUOs (const Handle(XSControl_WorkS // check if it is styled SHUO XCAFPrs_Style SHUOstyle; if ( !getSHUOstyle ( aSHUOlab, CTool, SHUOstyle ) ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: " << __FILE__ << ": do not store SHUO without any style to the STEP model" << endl; #endif continue; @@ -1891,13 +1888,13 @@ Standard_Boolean STEPCAFControl_Writer::WriteSHUOs (const Handle(XSControl_WorkS // create the top SHUO and all other. writeSHUO( aSHUO, CTool->ShapeTool(), WS, anEntOfSHUO, NAUOShape, aRelatingPD, isDeepest ); if ( anEntOfSHUO.IsNull() || NAUOShape.IsNull() ) { -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Warning: " << __FILE__ << ": Cannot store SHUO" << endl; #endif continue; } // create new Product Definition Shape for TOP SHUO -#ifdef DEB +#ifdef STEPCAFCONTROL_DEB cout << "Info: " << __FILE__ << ": Create NEW PDS for current SHUO " << endl; #endif Handle(StepRepr_ProductDefinitionShape) PDS = new StepRepr_ProductDefinitionShape; diff --git a/src/STEPConstruct/STEPConstruct.cxx b/src/STEPConstruct/STEPConstruct.cxx index 4456308878..7e38361278 100644 --- a/src/STEPConstruct/STEPConstruct.cxx +++ b/src/STEPConstruct/STEPConstruct.cxx @@ -52,7 +52,7 @@ Handle(StepRepr_RepresentationItem) STEPConstruct::FindEntity (const Handle(Tran Handle(StepRepr_RepresentationItem) item; Handle(TransferBRep_ShapeMapper) mapper = TransferBRep::ShapeMapper ( FinderProcess, Shape ); FinderProcess->FindTypedTransient (mapper,STANDARD_TYPE(StepRepr_RepresentationItem), item); -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB if ( item.IsNull() ) cout << Shape.TShape()->DynamicType()->Name() << ": RepItem not found" << endl; else cout << Shape.TShape()->DynamicType()->Name() << ": RepItem found: " << item->DynamicType()->Name() << endl; #endif @@ -79,7 +79,7 @@ Handle(StepRepr_RepresentationItem) STEPConstruct::FindEntity (const Handle(Tran mapper = TransferBRep::ShapeMapper ( FinderProcess, S ); FinderProcess->FindTypedTransient (mapper,STANDARD_TYPE(StepRepr_RepresentationItem), item); } -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB if ( item.IsNull() ) cout << Shape.TShape()->DynamicType()->Name() << ": RepItem not found" << endl; else if ( Loc != Shape.Location() ) cout << Shape.TShape()->DynamicType()->Name() << ": RepItem found for shape without location: " << item->DynamicType()->Name() << endl; else cout << Shape.TShape()->DynamicType()->Name() << ": RepItem found: " << item->DynamicType()->Name() << endl; diff --git a/src/STEPConstruct/STEPConstruct_Assembly.cxx b/src/STEPConstruct/STEPConstruct_Assembly.cxx index dfcd3c7cde..1cbebd5c85 100644 --- a/src/STEPConstruct/STEPConstruct_Assembly.cxx +++ b/src/STEPConstruct/STEPConstruct_Assembly.cxx @@ -188,7 +188,7 @@ Standard_Boolean STEPConstruct_Assembly::CheckSRRReversesNAUO(const Handle(Inter Handle(StepRepr_NextAssemblyUsageOccurrence)::DownCast ( CDSR->RepresentedProductRelation()->Definition().ProductDefinitionRelationship() ); if ( nauo.IsNull() ) { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << "Warning: No NAUO found in CDSR !" << endl; #endif return Standard_False; @@ -223,7 +223,7 @@ Standard_Boolean STEPConstruct_Assembly::CheckSRRReversesNAUO(const Handle(Inter return Standard_True; } -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << "Warning: SRR and NAUO are incompatible" << endl; // cout << "NAUO = " << Model->StringLabel(nauo)->ToCString() << // ",\tCDSR = " << Model->StringLabel(CDSR)->ToCString() << endl; diff --git a/src/STEPConstruct/STEPConstruct_ExternRefs.cxx b/src/STEPConstruct/STEPConstruct_ExternRefs.cxx index ccdd9b2fc6..aebbce305c 100644 --- a/src/STEPConstruct/STEPConstruct_ExternRefs.cxx +++ b/src/STEPConstruct/STEPConstruct_ExternRefs.cxx @@ -228,10 +228,6 @@ Standard_Boolean STEPConstruct_ExternRefs::LoadExternRefs () // search for Document file Handle(StepBasic_DocumentFile) DocFile; if ( aPDWAD.IsNull() ) { // shoudnot be begin from TRJ11 -// #ifdef DEB -// cout << "Warning: Cannot find PDWAD corresponding to ADR to search Document File. " << endl; -// cout << "Info: Looking for Document File direct from ARD" << endl; -// #endif // lookinf from ADR subs4 = Graph().Shareds(ADR); } else @@ -344,10 +340,6 @@ const Standard_CString STEPConstruct_ExternRefs::FileName (const Standard_Intege // search for Document file Interface_EntityIterator subs4; if ( aPDWAD.IsNull() ) { // shoudnot be begin from TRJ11 -// #ifdef DEB -// cout << "Warning: Cannot find PDWAD corresponding to ADR to search Document File. " << endl; -// cout << "Info: Looking for DocumentFile direct from ARD" << endl; -// #endif // lookinf from ADR subs4 = Graph().Shareds(ADR); } else diff --git a/src/STEPConstruct/STEPConstruct_Styles.cxx b/src/STEPConstruct/STEPConstruct_Styles.cxx index 35e0ee78e6..4c4ba9b0e3 100644 --- a/src/STEPConstruct/STEPConstruct_Styles.cxx +++ b/src/STEPConstruct/STEPConstruct_Styles.cxx @@ -309,7 +309,7 @@ Handle(StepRepr_RepresentationContext) STEPConstruct_Styles::FindContext (const Handle(TransferBRep_ShapeMapper) mapper = TransferBRep::ShapeMapper ( FinderProcess(), Shape ); Handle(StepShape_ShapeRepresentation) sr; if ( FinderProcess()->FindTypedTransient (mapper,STANDARD_TYPE(StepShape_ShapeRepresentation), sr) ) { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB // cout << "Context of " << Shape.TShape()->DynamicType()->Name() << ": SR found: " << sr->DynamicType()->Name() << endl; #endif Context = sr->ContextOfItems(); @@ -317,12 +317,12 @@ Handle(StepRepr_RepresentationContext) STEPConstruct_Styles::FindContext (const else { Handle(StepGeom_GeometricRepresentationItem) item; if ( FinderProcess()->FindTypedTransient (mapper,STANDARD_TYPE(StepGeom_GeometricRepresentationItem), item) ) { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB // cout << "Context of " << Shape.TShape()->DynamicType()->Name() << ": GeomRepItem found: " << item->DynamicType()->Name() << endl; #endif Interface_EntityIterator subs = Graph().Sharings(item); for (subs.Start(); Context.IsNull() && subs.More(); subs.Next()) { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB // cout << "Parsing back refs: found " << subs.Value()->DynamicType()->Name() << endl; #endif if ( ! subs.Value()->IsKind(STANDARD_TYPE(StepShape_ShapeRepresentation)) ) continue; @@ -331,7 +331,7 @@ Handle(StepRepr_RepresentationContext) STEPConstruct_Styles::FindContext (const } } } -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB if ( Context.IsNull() ) { cout << Shape.TShape()->DynamicType()->Name() << ": Cannot find context" << endl; } @@ -492,7 +492,7 @@ Handle(StepVisual_PresentationStyleAssignment) STEPConstruct_Styles::MakeColorPS } if ( items.Length() <1 ) { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << "Error: no color is supplied" << endl; #endif return PSA; @@ -719,7 +719,7 @@ Standard_Boolean STEPConstruct_Styles::DecodeColor (const Handle(StepVisual_Colo else if ( name.IsEqual ( "black" ) ) Col.SetValues ( Quantity_NOC_BLACK ); else if ( name.IsEqual ( "white" ) ) Col.SetValues ( Quantity_NOC_WHITE ); else { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << "Error: color name \"" << name << "\" is not recognized" << endl; #endif return Standard_False; diff --git a/src/STEPConstruct/STEPConstruct_UnitContext.cxx b/src/STEPConstruct/STEPConstruct_UnitContext.cxx index 5d7d28fe80..1d5baa847d 100644 --- a/src/STEPConstruct/STEPConstruct_UnitContext.cxx +++ b/src/STEPConstruct/STEPConstruct_UnitContext.cxx @@ -258,7 +258,7 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepRepr lengthDone = planeAngleDone = solidAngleDone = Standard_False; if (aContext.IsNull()) { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout<<" -- STEPConstruct_UnitContext:ComputeFactor, Context undefined -> default"<UnitsValue(i); status = ComputeFactors(theNamedUnit); -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB if(status == -1) cout << " -- STEPConstruct_UnitContext:ComputeFactor: Unit item no." << i << " is not recognized" << endl; #endif @@ -342,7 +342,7 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi } else { status = 14; -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << "Error in the file : parameter double defined" << endl; #endif } @@ -367,7 +367,7 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi } else { status = 14; -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << "Error in the file : parameter double defined" << endl; #endif } @@ -375,7 +375,7 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi // Defining a type of unit if(!parameterDone) { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << "Unit Type not implemented" << endl; #endif return 0; @@ -392,7 +392,7 @@ Standard_Integer STEPConstruct_UnitContext::ComputeFactors(const Handle(StepBasi lengthDone = Standard_True; else { status = 14; -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << "Error in the file : LengthFactor double defined" << endl; #endif } @@ -453,7 +453,7 @@ Standard_Integer STEPConstruct_UnitContext::ComputeTolerance for (Standard_Integer un = 1 ; un <= nbUncertainty ; un ++) { Handle(StepBasic_UncertaintyMeasureWithUnit) aUMWU = aContext->UncertaintyValue(un); if (aUMWU.IsNull()) { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout<<"BAD Uncertainty Measure with Units, n0."<Find ( mapper ); -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB // cout << "\n>========------" << endl; // cout << "Binders for " << Shape.TShape()->DynamicType()->Name() << " " << *(void**)&Shape.TShape() << ", Loc = " << *(void**)&Shape.Location() << endl; // cout << "mapper = " << *(void**)&mapper << ", binder = " << *(void**)&binder << endl; @@ -149,11 +149,11 @@ Standard_Boolean STEPConstruct_ValidationProps::FindTarget (const TopoDS_Shape & target.SetValue ( CDSR->RepresentedProductRelation() ); Context = CDSR->RepresentationRelation()->Rep2()->ContextOfItems(); } -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB else cout << "INSTANCE: CDRS from NAUO NOT found" << endl; #endif } -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB else cout << "INSTANCE: NAUO NOT found" << endl; #endif */ @@ -169,12 +169,12 @@ Standard_Boolean STEPConstruct_ValidationProps::FindTarget (const TopoDS_Shape & PDS = Handle(StepRepr_ProductDefinitionShape)::DownCast(subs1.Value()); } target.SetValue ( PDS ); -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB // cout << "COMPOUND: SDR found: " << sdr->DynamicType()->Name() << endl; #endif } else { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << "COMPOUND: ProdDef NOT found" << endl; #endif Handle(StepShape_ShapeRepresentation) SR; @@ -220,14 +220,14 @@ Standard_Boolean STEPConstruct_ValidationProps::FindTarget (const TopoDS_Shape & else { Handle(StepGeom_GeometricRepresentationItem) item; if ( FinderProcess()->FindTypedTransient (mapper,STANDARD_TYPE(StepGeom_GeometricRepresentationItem), item) ) { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB // cout << Shape.TShape()->DynamicType()->Name() << ": GeomRepItem found: " << item->DynamicType()->Name() << endl; #endif // find PDS (GRI <- SR <- SDR -> PDS) Handle(StepRepr_ProductDefinitionShape) PDS; Interface_EntityIterator subs = Graph().Sharings(item); for (subs.Start(); PDS.IsNull() && subs.More(); subs.Next()) { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB // cout << "Parsing back refs: found " << subs.Value()->DynamicType()->Name() << endl; #endif if ( ! subs.Value()->IsKind(STANDARD_TYPE(StepShape_ShapeRepresentation)) ) continue; @@ -262,7 +262,7 @@ Standard_Boolean STEPConstruct_ValidationProps::FindTarget (const TopoDS_Shape & if ( aspect.IsNull() ) { // if ( ! FinderProcess()->FindTypedTransient (mapper,STANDARD_TYPE(StepRepr_ShapeAspect), aspect ) || // aspect->OfShape() != PDS ) -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << Shape.TShape()->DynamicType()->Name() << ": SHAPE_ASPECT NOT found, creating" << endl; #endif // create aspect and all related data @@ -299,7 +299,7 @@ Standard_Boolean STEPConstruct_ValidationProps::FindTarget (const TopoDS_Shape & } // SHAPE_ASPECT found, but we also need context: FIND IT !!!! else { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << Shape.TShape()->DynamicType()->Name() << ": SHAPE_ASPECT found" << endl; #endif Handle(StepRepr_ProductDefinitionShape) aPDS = aspect->OfShape(); @@ -314,11 +314,11 @@ Standard_Boolean STEPConstruct_ValidationProps::FindTarget (const TopoDS_Shape & if ( ! aspect.IsNull() ) target.SetValue ( aspect ); } -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB else cout << Shape.TShape()->DynamicType()->Name() << ": PDS NOT found, fail to create SHAPE_ASPECT" << endl; #endif } -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB else cout << Shape.TShape()->DynamicType()->Name() << ": GeomRepItem NOT found" << endl; #endif } @@ -673,7 +673,7 @@ Standard_Boolean STEPConstruct_ValidationProps::GetPropReal (const Handle(StepRe if ( Name == "AREA_MEASURE" ) isArea = Standard_True; else if ( Name == "VOLUME_MEASURE" ) isArea = Standard_False; else { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << "Warning: Measure " << Model()->StringLabel ( M ) << " is neither area not volume" << endl; #endif return Standard_False; @@ -696,7 +696,7 @@ Standard_Boolean STEPConstruct_ValidationProps::GetPropPnt (const Handle(StepRep Handle(StepGeom_CartesianPoint) P = Handle(StepGeom_CartesianPoint)::DownCast ( item ); if ( P.IsNull() || P->NbCoordinates() != 3 ) { -#ifdef DEB +#ifdef STEPCONSTRUCT_DEB cout << "Warning: Point " << Model()->StringLabel ( P ) << " is not valid for centroid" << endl; #endif return Standard_False;; diff --git a/src/STEPControl/STEPControl_ActorRead.cxx b/src/STEPControl/STEPControl_ActorRead.cxx index 6eaf767cbc..3f2ebe68c4 100644 --- a/src/STEPControl/STEPControl_ActorRead.cxx +++ b/src/STEPControl/STEPControl_ActorRead.cxx @@ -131,7 +131,7 @@ // Purpose: Use it in DEB mode to dump your shapes // ============================================================================ -#ifdef DEB +#ifdef STEPCONTROL_DEB static void DumpWhatIs(const TopoDS_Shape& S) { TopTools_MapOfShape aMapOfShape; @@ -287,12 +287,12 @@ Handle(Transfer_Binder) STEPControl_ActorRead::Transfer Handle(TCollection_HAsciiString) aPPVersion = aFileNameEntity->PreprocessorVersion(); if(aPPVersion.IsNull()) continue; - #ifdef DEB + #ifdef STEPCONTROL_DEB cout << "Preprocessor version detected: " << aPPVersion->ToCString() << endl; #endif Standard_Integer anIDeasResult = aPPVersion->Search("I-DEAS"); if (anIDeasResult != -1) { - #ifdef DEB + #ifdef STEPCONTROL_DEB cout << "Recognized as I-DEAS STP" << endl; #endif myNMTool.SetIDEASCase(Standard_True); @@ -783,7 +783,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han if ( isNMMode && sr->IsKind(STANDARD_TYPE(StepShape_NonManifoldSurfaceShapeRepresentation)) ) { isManifold = Standard_False; NM_DETECTED = Standard_True; - #ifdef DEB + #ifdef STEPCONTROL_DEB Standard_Integer NMSSRItemsLen = sr->Items()->Length(); cout << "NMSSR with " << NMSSRItemsLen << " items detected" << endl; #endif @@ -794,11 +794,11 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han if (isNMMode && myNMTool.IsIDEASCase() && isIDeasMode) { isManifold = Standard_False; NM_DETECTED = Standard_True; - #ifdef DEB + #ifdef STEPCONTROL_DEB cout << "I-DEAS post processing for non-manifold topology ENABLED" << endl; #endif } - #ifdef DEB + #ifdef STEPCONTROL_DEB else if ( myNMTool.IsIDEASCase() ) cout << "I-DEAS post processing for non-manifold topology DISABLED" << endl; #endif @@ -910,7 +910,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han TP->Bind(sr, shbinder); - #ifdef DEB + #ifdef STEPCONTROL_DEB DumpWhatIs(comp); #endif @@ -1775,7 +1775,7 @@ TopoDS_Shell STEPControl_ActorRead::closeIDEASShell(const TopoDS_Shell& shell, if (subCheckStatus != BRepCheck_NoError) brepBuilder.Add(result, currentFace); else { - #ifdef DEB + #ifdef STEPCONTROL_DEB cout << "Redundant closing face detected: REMOVED from shell"; #endif } diff --git a/src/STEPControl/STEPControl_ActorWrite.cxx b/src/STEPControl/STEPControl_ActorWrite.cxx index efc1b6181c..f032b14cec 100644 --- a/src/STEPControl/STEPControl_ActorWrite.cxx +++ b/src/STEPControl/STEPControl_ActorWrite.cxx @@ -120,7 +120,7 @@ // Purpose: Use it in DEB mode to dump your shapes // ============================================================================ -#ifdef DEB +#ifdef STEPCONTROL_DEB static void DumpWhatIs(const TopoDS_Shape& S) { TopTools_MapOfShape aMapOfShape; @@ -194,7 +194,7 @@ static Standard_Boolean IsManifoldShape(const TopoDS_Shape& theShape) { aBrepBuilder.Add(aDirectShapes, aDirectChild); } - #ifdef DEB + #ifdef STEPCONTROL_DEB DumpWhatIs(aDirectShapes); #endif @@ -202,7 +202,7 @@ static Standard_Boolean IsManifoldShape(const TopoDS_Shape& theShape) { TopExp::MapShapesAndAncestors(aDirectShapes, TopAbs_EDGE, TopAbs_FACE, aMapEdgeFaces); Standard_Integer aNbEdges = aMapEdgeFaces.Extent(); - #ifdef DEB + #ifdef STEPCONTROL_DEB cout << "Checking whether the topology passed is manifold..." << endl; #endif @@ -218,7 +218,7 @@ static Standard_Boolean IsManifoldShape(const TopoDS_Shape& theShape) { } } - #ifdef DEB + #ifdef STEPCONTROL_DEB cout << "Check result: " << (aResult ? "TRUE" : "FALSE") << endl; #endif @@ -279,13 +279,13 @@ Handle(StepShape_NonManifoldSurfaceShapeRepresentation) STEPControl_ActorWrite:: } if ( aResult.IsNull() ) { - #ifdef DEB + #ifdef STEPCONTROL_DEB cout << "\nNew NMSSR created" << endl; #endif aResult = new StepShape_NonManifoldSurfaceShapeRepresentation; isNMSSRCreated = Standard_True; } else { - #ifdef DEB + #ifdef STEPCONTROL_DEB cout << "\nExisting NMSSR is used" << endl; #endif isNMSSRCreated = Standard_False; @@ -628,7 +628,7 @@ Handle(Transfer_Binder) STEPControl_ActorWrite::TransferShape (const Handle(Tran //:abv 20.05.02: writing box & face from it (shared) in one compound // as assembly - while face already translated, it should be // re-translated to break sharing -#ifdef DEB +#ifdef STEPCONTROL_DEB cout << "Warning: STEPControl_ActorWrite::TransferShape(): shape already translated" << endl; #endif // return binder; @@ -1294,7 +1294,7 @@ Handle(Transfer_Binder) STEPControl_ActorWrite::TransferCompound (const Handle(T BRep_Builder aB; aB.MakeCompound(aCompOfVrtx); - #ifdef DEB + #ifdef STEPCONTROL_DEB if (!isManifold) cout << "Exploding Solids to Shells if any..." << endl; #endif diff --git a/src/STEPControl/STEPControl_Reader.cxx b/src/STEPControl/STEPControl_Reader.cxx index f448637e94..996cc73ed2 100644 --- a/src/STEPControl/STEPControl_Reader.cxx +++ b/src/STEPControl/STEPControl_Reader.cxx @@ -150,7 +150,7 @@ Standard_Integer STEPControl_Reader::NbRootsForTransfer() break; } if (iSexclude) { -#ifdef DEB +#ifdef STEPCONTROL_DEB cout << "Warning: STEPControl_Reader::NbRootsForTransfer exclude PDWAD from roots" << endl; #endif continue; diff --git a/src/ShapeAnalysis/ShapeAnalysis_Curve.cxx b/src/ShapeAnalysis/ShapeAnalysis_Curve.cxx index 8b83b3229a..396df02d4f 100644 --- a/src/ShapeAnalysis/ShapeAnalysis_Curve.cxx +++ b/src/ShapeAnalysis/ShapeAnalysis_Curve.cxx @@ -77,7 +77,7 @@ static void ProjectOnSegments (const Adaptor3d_Curve& AC, const gp_Pnt& P3D, } if (aHasChanged) distmin = Sqrt (distmin2); -#ifdef DEBUG +#ifdef SHAPEANALYSIS_DEB cout<<"ShapeAnalysis_Geom:Project, param="< distmin="<Print(cout); cout << endl; #endif @@ -481,25 +481,25 @@ Standard_Boolean ShapeAnalysis_Curve::ValidateRange (const Handle(Geom_Curve)& t if (theCurve->IsKind(STANDARD_TYPE(Geom_BoundedCurve)) && !theCurve->IsClosed()) { if (First < cf) { -#ifdef DEBUG +#ifdef SHAPEANALYSIS_DEB cout << "Update Edge First Parameter to Curve First Parameter" << endl; #endif First = cf; } else if (First > cl) { -#ifdef DEBUG +#ifdef SHAPEANALYSIS_DEB cout << "Update Edge First Parameter to Curve Last Parameter" << endl; #endif First = cl; } if (Last < cf) { -#ifdef DEBUG +#ifdef SHAPEANALYSIS_DEB cout << "Update Edge Last Parameter to Curve First Parameter" << endl; #endif Last = cf; } else if (Last > cl) { -#ifdef DEBUG +#ifdef SHAPEANALYSIS_DEB cout << "Update Edge Last Parameter to Curve Last Parameter" << endl; #endif Last = cl; @@ -531,7 +531,7 @@ Standard_Boolean ShapeAnalysis_Curve::ValidateRange (const Handle(Geom_Curve)& t if ( theCurve->Value(First).Distance(theCurve->Value(cf)) < preci ) First = cf; if ( theCurve->Value(Last).Distance(theCurve->Value(cl)) < preci ) Last = cl; if ( First > Last ) { -#ifdef DEBUG +#ifdef SHAPEANALYSIS_DEB cout << "Warning : parameter range of edge crossing non periodic curve origin" << endl; #endif Standard_Real tmp = First; @@ -559,7 +559,7 @@ Standard_Boolean ShapeAnalysis_Curve::ValidateRange (const Handle(Geom_Curve)& t // illegal sur une courbe fermee non periodique // on inverse quand meme les parametres !!!!!! else { -#ifdef DEBUG +#ifdef SHAPEANALYSIS_DEB cout << "Warning : parameter range of edge crossing non periodic curve origin" << endl; #endif Standard_Real tmp = First; @@ -569,7 +569,7 @@ Standard_Boolean ShapeAnalysis_Curve::ValidateRange (const Handle(Geom_Curve)& t } //abv 15.03.00 #72 bm1_pe_t4 protection of exceptions in draw else if ( First > Last ) { -#ifdef DEBUG +#ifdef SHAPEANALYSIS_DEB cout << "Warning: parameter range is bad; curve reversed" << endl; #endif First = theCurve->ReversedParameter ( First ); @@ -583,7 +583,7 @@ Standard_Boolean ShapeAnalysis_Curve::ValidateRange (const Handle(Geom_Curve)& t } } else { -#ifdef DEBUG +#ifdef SHAPEANALYSIS_DEB cout << "UpdateParam3d Failed" << endl; cout << " - Curve Type : " << theCurve->DynamicType() << endl; cout << " - Param 1 : " << First << endl; @@ -591,7 +591,7 @@ Standard_Boolean ShapeAnalysis_Curve::ValidateRange (const Handle(Geom_Curve)& t #endif //abv 15.03.00 #72 bm1_pe_t4 protection of exceptions in draw if ( First > Last ) { -#ifdef DEBUG +#ifdef SHAPEANALYSIS_DEB cout << "Warning: parameter range is bad; curve reversed" << endl; #endif First = theCurve->ReversedParameter ( First ); diff --git a/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx b/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx index 2a834166ed..e1dbc0c7d3 100644 --- a/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx +++ b/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx @@ -473,7 +473,7 @@ static Handle(Geom_Curve) ComputeIso } catch(Standard_Failure) { iso.Nullify(); -#ifdef DEB //:s5 +#ifdef SHAPEANALYSIS_DEB //:s5 cout << "\nWarning: ShapeAnalysis_Surface, ComputeIso(): Exception in UVIso(): "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -968,12 +968,12 @@ gp_Pnt2d ShapeAnalysis_Surface::ValueOfUV(const gp_Pnt& P3D,const Standard_Real gp_Pnt2d prev(S,T); gp_Pnt2d solution; if (SurfaceNewton(prev,P3D,preci,solution)) { -#ifdef DEBUG +#ifdef SHAPEANALYSIS_DEB cout <<"Newton found point on conic extrusion"<Print(cout); cout << endl; #endif @@ -1325,7 +1325,7 @@ Standard_Real ShapeAnalysis_Surface::UVFromIso(const gp_Pnt& P3d,const Standard_ } // fin try RAJOUT catch(Standard_Failure) { theMin = RealLast(); // theMin de depart -#ifdef DEB //:s5 +#ifdef SHAPEANALYSIS_DEB //:s5 cout << "\nWarning: ShapeAnalysis_Curve::UVFromIso(): Exception: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif diff --git a/src/ShapeBuild/ShapeBuild_Edge.cxx b/src/ShapeBuild/ShapeBuild_Edge.cxx index 197c1c0b2b..e0decd984d 100644 --- a/src/ShapeBuild/ShapeBuild_Edge.cxx +++ b/src/ShapeBuild/ShapeBuild_Edge.cxx @@ -634,7 +634,7 @@ Standard_Boolean ShapeBuild_Edge::BuildCurve3d (const TopoDS_Edge& edge) const } } catch(Standard_Failure) { -#ifdef DEB +#ifdef SHAPEBUILD_DEB cout << "\nWarning: ShapeBuild_Edge: Exception in BuildCurve3d: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -662,7 +662,7 @@ void ShapeBuild_Edge::MakeEdge(TopoDS_Edge& edge,const Handle(Geom_Curve)& curve { BRepBuilderAPI_MakeEdge ME (curve, p1, p2); if (!ME.IsDone()) { -#ifdef DEB +#ifdef SHAPEBUILD_DEB cout << "\nWarning: ShapeBuild_Edge::MakeEdge BRepAPI_NotDone"; #endif return; @@ -727,7 +727,7 @@ void ShapeBuild_Edge::MakeEdge(TopoDS_Edge& edge,const Handle(Geom2d_Curve)& pcu { BRepBuilderAPI_MakeEdge ME (pcurve, S, p1, p2); if (!ME.IsDone()) { -#ifdef DEB +#ifdef SHAPEBUILD_DEB cout << "\nWarning: ShapeBuild_Edge::MakeEdge BRepAPI_NotDone"; #endif return; diff --git a/src/ShapeConstruct/ShapeConstruct.cxx b/src/ShapeConstruct/ShapeConstruct.cxx index d55f73bde5..78cf7dca49 100644 --- a/src/ShapeConstruct/ShapeConstruct.cxx +++ b/src/ShapeConstruct/ShapeConstruct.cxx @@ -80,7 +80,7 @@ Handle(Geom_BSplineCurve) ShapeConstruct::ConvertCurveToBSpline(const Handle(Geo aBSpline = GeomConvert::CurveToBSplineCurve(C3D,Convert_QuasiAngular); } catch (Standard_Failure) { -#ifdef DEB +#ifdef SHAPECONSTRUCT_DEB cout << "Warning: GeomConvert_ApproxSurface Exception: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -211,7 +211,7 @@ Handle(Geom_BSplineSurface) ShapeConstruct::ConvertSurfaceToBSpline(const Handle Handle(Geom_BSplineCurve) bspl = ConvertCurveToBSpline(basis, VF, VL, Tol3d, cnt, MaxSegments, MaxDegree); gp_Ax1 axis = revol->Axis(); Handle(Geom_SurfaceOfRevolution) newRevol = new Geom_SurfaceOfRevolution(bspl,axis); -#ifdef DEB +#ifdef SHAPECONSTRUCT_DEB cout <<" Revolution on offset converted" << endl; #endif S = newRevol; @@ -228,7 +228,7 @@ Handle(Geom_BSplineSurface) ShapeConstruct::ConvertSurfaceToBSpline(const Handle Standard_Boolean Done = anApprox.IsDone(); if (anApprox.MaxError() <= Tol3d && Done) { -#ifdef DEB +#ifdef SHAPECONSTRUCT_DEB Standard_Integer nbOfSpan = (anApprox.Surface()->NbUKnots()-1)*(anApprox.Surface()->NbVKnots()-1); cout << "\terror = " << anApprox.MaxError() << "\tspans = " << nbOfSpan << endl; cout << " Surface is aproximated with continuity " << (GeomAbs_Shape)cnt <Print(cout); cout << endl; #endif @@ -352,7 +352,7 @@ Standard_Boolean ShapeConstruct::JoinPCurves(const Handle(TopTools_HSequenceOfSh return (i <= edges->Length()); } catch ( Standard_Failure ) { -#ifdef DEB +#ifdef SHAPECONSTRUCT_DEB cout<<"Error: ShapeConstruct::JoinPCurves Exception in GeomConvert_CompCurveToBSplineCurve: "; Standard_Failure::Caught()->Print(cout); cout<Print(cout); cout << endl; #endif @@ -179,7 +179,7 @@ Handle(Geom_BSplineCurve) ShapeConstruct_Curve::ConvertToBSpline (const Handle(G return bspl; } catch ( Standard_Failure ) { -#ifdef DEB +#ifdef SHAPECONSTRUCT_DEB cout << "Warning: ShapeConstruct_Curve::ConvertToBSpline(): Exception in Segment: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -197,7 +197,7 @@ Handle(Geom_BSplineCurve) ShapeConstruct_Curve::ConvertToBSpline (const Handle(G bspl = Conv.Curve(); } catch ( Standard_Failure ) { -#ifdef DEB +#ifdef SHAPECONSTRUCT_DEB cout << "Warning: ShapeConstruct_Curve::ConvertToBSpline(): Exception in Approx_Curve3d: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -228,7 +228,7 @@ Handle(Geom2d_BSplineCurve) ShapeConstruct_Curve::ConvertToBSpline (const Handle bspl = Geom2dConvert::CurveToBSplineCurve(tc); } catch ( Standard_Failure ) { -#ifdef DEB +#ifdef SHAPECONSTRUCT_DEB cout << "Warning: ShapeConstruct_Curve::ConvertToBSpline(): Exception in Geom2dConvert: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -249,7 +249,7 @@ Handle(Geom2d_BSplineCurve) ShapeConstruct_Curve::ConvertToBSpline (const Handle return bspl; } catch ( Standard_Failure ) { -#ifdef DEB +#ifdef SHAPECONSTRUCT_DEB cout << "Warning: ShapeConstruct_Curve::ConvertToBSpline(): Exception in Segment: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -268,7 +268,7 @@ Handle(Geom2d_BSplineCurve) ShapeConstruct_Curve::ConvertToBSpline (const Handle bspl = Conv.Curve(); } catch ( Standard_Failure ) { -#ifdef DEB +#ifdef SHAPECONSTRUCT_DEB cout << "Warning: ShapeConstruct_Curve::ConvertToBSpline(): Exception in Approx_Curve3d: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif diff --git a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx index f3f9bff88d..a130e32c18 100644 --- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx +++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx @@ -243,7 +243,7 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::Perform (Handle(Geom_Curv if ( bspl->Knot(i+1) > First && bspl->Knot(i) < Last ) nint++; Standard_Integer minPnt = nint * ( bspl->Degree() + 1 ); while ( nbPini < minPnt ) nbPini += NCONTROL - 1; -#ifdef DEBUG +#ifdef SHAPECONSTRUCT_DEB if ( nbPini > NCONTROL ) cout << "Warning: number of points for projecting is " << nbPini << endl; #endif @@ -358,12 +358,12 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformByProjLib(Handle(G if ( appr.IsDone() ) c2d = appr.Curve2d(); } -#ifdef DEB +#ifdef SHAPECONSTRUCT_DEB else cout<<"Warning: ProjLib cutting pcurve "<< First << " -> " << ubeg <<" ; "<< Last << " -> " << ufin << endl; #endif } -#ifdef DEB +#ifdef SHAPECONSTRUCT_DEB else cout<<"Warning: ProjLib "<< nbSol << " curves in ProjLib"<Print(cout); cout << endl; #endif @@ -456,9 +456,7 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G Handle(Geom2d_TrimmedCurve) TC = Handle(Geom2d_TrimmedCurve)::DownCast ( result ); result = TC->BasisCurve(); } -#ifdef DEB -// if ( ! result.IsNull() ) cout << "SC_PCONS: analitic projection on plane" << endl; -#endif + return result; } @@ -678,7 +676,7 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G Standard_Real Up = ul - uf; Standard_Real Vp = vl - vf; Standard_Real dist2d; -#ifdef DEBUG +#ifdef SHAPECONSTRUCT_DEB if (mySurf->IsUClosed(myPreci) && mySurf->IsVClosed(myPreci)) {//#78 rln 12.03.99 S4135 cout << "WARNING : Recadrage incertain sur U & VClosed" << endl; } @@ -831,7 +829,7 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G pnt2d (i) = newCurr; } // on verifie -#ifdef DEBUG +#ifdef SHAPECONSTRUCT_DEB dist2d = pnt2d (i-1).Distance(pnt2d (i)); if (dist2d > ( Vp / 2) ) { cout << "Echec dans le recadrage" << endl; @@ -1032,7 +1030,7 @@ Handle(Geom2d_Curve) ShapeConstruct_ProjectCurveOnSurface::ApproximatePCurve(con return C2d; } catch(Standard_Failure) { -#ifdef DEB //:s5 +#ifdef SHAPECONSTRUCT_DEB //:s5 // debug ... Standard_Integer nbp = params->Length(); Standard_Integer nb2 = points2d->Length(); @@ -1076,7 +1074,7 @@ Handle(Geom2d_Curve) ShapeConstruct_ProjectCurveOnSurface::ApproximatePCurve(con if (myInterPol2d.IsDone()) C2d = myInterPol2d.Curve(); } catch(Standard_Failure) { -#ifdef DEB //:s5 +#ifdef SHAPECONSTRUCT_DEB //:s5 // // debug ... Standard_Integer nbp = params->Length(); Standard_Integer nb2 = points2d->Length(); @@ -1118,7 +1116,7 @@ Handle(Geom_Curve) ShapeConstruct_ProjectCurveOnSurface::InterpolateCurve3d(cons } catch(Standard_Failure) { C3d.Nullify(); -#ifdef DEB //:s5 +#ifdef SHAPECONSTRUCT_DEB //:s5 cout << "Warning: ShapeConstruct_ProjectCurveOnSurface::InterpolateCurve3d(): Exception: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -1165,13 +1163,13 @@ Handle(Geom_Curve) ShapeConstruct_ProjectCurveOnSurface::InterpolateCurve3d(cons if (nbPntDropped == 0) return; -#ifdef DEBUG +#ifdef SHAPECONSTRUCT_DEB cout << "Warning : removing 3d points for interpolation" << endl; #endif // Build new HArrays Standard_Integer newLast = lastElem - nbPntDropped; if ((newLast - firstElem + 1) < 2) { -#ifdef DEBUG +#ifdef SHAPECONSTRUCT_DEB cout << "Too many degenerated points for 3D interpolation" << endl; #endif return; @@ -1236,13 +1234,13 @@ Handle(Geom_Curve) ShapeConstruct_ProjectCurveOnSurface::InterpolateCurve3d(cons if (nbPntDropped == 0) return; -#ifdef DEBUG +#ifdef SHAPECONSTRUCT_DEB cout << "Warning : removing 2d points for interpolation" << endl; #endif // Build new HArrays Standard_Integer newLast = lastElem - nbPntDropped; if ((newLast - firstElem + 1) < 2) { -#ifdef DEBUG +#ifdef SHAPECONSTRUCT_DEB cout << "Too many degenerated points for 2D interpolation" << endl; #endif //pdn 12.02.99 S4135 Creating pcurve with minimal length. @@ -1261,7 +1259,7 @@ Handle(Geom_Curve) ShapeConstruct_ProjectCurveOnSurface::InterpolateCurve3d(cons Standard_Integer newCurr = 1; for (i = firstElem; i <= lastElem ; i++) { if (tmpParam.Value(i) == 1) { -#ifdef DEBUG +#ifdef SHAPECONSTRUCT_DEB cout << "Point " << i << " : " << points->Value(i).X() << " " << points->Value(i).Y() << " at param " << params->Value(i) << endl; #endif newPnts->SetValue(newCurr, points->Value(i)); @@ -1269,7 +1267,7 @@ Handle(Geom_Curve) ShapeConstruct_ProjectCurveOnSurface::InterpolateCurve3d(cons newCurr ++; } else { -#ifdef DEBUG +#ifdef SHAPECONSTRUCT_DEB cout << "Removed " << i << " : " << points->Value(i).X() << " " << points->Value(i).Y() << " at param " << params->Value(i) << endl; #endif } @@ -1518,13 +1516,13 @@ Handle(Geom_Curve) ShapeConstruct_ProjectCurveOnSurface::InterpolateCurve3d(cons } // RAJOUT catch(Standard_Failure) { // pb : on affiche ce qu on peut -#ifdef DEBUG +#ifdef SHAPECONSTRUCT_DEB for (Standard_Integer numpnt = 1; numpnt <= nbrPnt; numpnt ++) { cout<<"["<Print(cout); cout << endl; #endif diff --git a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx index 2b37fff1fc..97842aaba6 100644 --- a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx +++ b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx @@ -454,7 +454,7 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertSurface(const Handle(Geo if(ConvertCurve(BasCurve,ResCurve,Standard_False,Max(VF,BasCurve->FirstParameter()),Min(VL,BasCurve->LastParameter()),TolS,Standard_False)) { Handle(Geom_SurfaceOfRevolution) newRevol = new Geom_SurfaceOfRevolution(ResCurve,Surface->Axis()); aSurf = newRevol; -#ifdef DEB +#ifdef SHAPECUSTOM_DEB cout <<" Revolution on offset converted" << endl; #endif } @@ -655,7 +655,7 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertSurface(const Handle(Geo if (anApprox.MaxError() <= myTol3d && Done) { nbOfSpan = (anApprox.Surface()->NbUKnots()-1)*(anApprox.Surface()->NbVKnots()-1); -#ifdef DEB +#ifdef SHAPECUSTOM_DEB if((imax-i+1)!=1) { cout << " iteration = " << i << "\terror = " << anApprox.MaxError() @@ -696,17 +696,13 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertSurface(const Handle(Geo return Standard_True; } else { - //#ifdef DEB - // cout<< " iteration = " << imax-i+1 - // << "\terror = " << anApprox.MaxError() <Print(cout); cout << endl; #endif @@ -733,7 +729,7 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertSurface(const Handle(Geo else continue; } else { -#ifdef DEB +#ifdef SHAPECUSTOM_DEB cout<<" Approximation iteration out. Surface is not aproximated." << endl; #endif return Standard_False; @@ -743,7 +739,7 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertSurface(const Handle(Geo if(MaxDeg < myParameters->GMaxDegree()) { MaxDeg = myParameters->GMaxDegree(); continue;} else { -#ifdef DEB +#ifdef SHAPECUSTOM_DEB cout<<" Approximation iteration out. Surface is not aproximated." << endl; #endif return Standard_False; @@ -996,7 +992,7 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertCurve(Handle(Geom_Curve) (anApprox.MaxError() >= Max(TolCur,myTol3d)))) { if(MaxSeg < myParameters->GMaxSeg()) { MaxSeg = myParameters->GMaxSeg(); aC =aC1; continue;} else { -#ifdef DEB +#ifdef SHAPECUSTOM_DEB cout << "Curve is not aproxed with continuity "<< aCont<GMaxDegree(); aC = aC1; continue; } else { -#ifdef DEB +#ifdef SHAPECUSTOM_DEB cout << "Curve is not aproxed with continuity "<< aCont<Print(cout); cout << endl; #endif @@ -1304,7 +1300,7 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertCurve2d(Handle(Geom2d_Cu if(myDeg && ((DegC > MaxDeg) || !Done || ( anApprox.MaxError() >= Max(myTol2d,TolCur)))) { if(MaxSeg < myParameters->GMaxSeg()) { MaxSeg = myParameters->GMaxSeg(); aC =aC1; continue;} else { -#ifdef DEB +#ifdef SHAPECUSTOM_DEB cout << "Curve is not aproxed with continuity "<< aCont<GMaxDegree(); aC =aC1; continue; } else { -#ifdef DEB +#ifdef SHAPECUSTOM_DEB cout << "Curve is not aproxed with continuity "<< aCont<Print(cout); cout << endl; #endif diff --git a/src/ShapeCustom/ShapeCustom_Curve.cxx b/src/ShapeCustom/ShapeCustom_Curve.cxx index ddf0700539..390599211d 100644 --- a/src/ShapeCustom/ShapeCustom_Curve.cxx +++ b/src/ShapeCustom/ShapeCustom_Curve.cxx @@ -104,7 +104,7 @@ Handle(Geom_Curve) ShapeCustom_Curve::ConvertToPeriodic (const Standard_Boolean converted = Standard_True; } } -#ifdef DEBUG +#ifdef SHAPECUSTOM_DEB cout << "Warning: ShapeCustom_Surface: Closed BSplineSurface is caused to be periodic" << endl; #endif if ( ! converted ) return newCurve; diff --git a/src/ShapeCustom/ShapeCustom_Surface.cxx b/src/ShapeCustom/ShapeCustom_Surface.cxx index ab77d86368..0659b5fc4c 100644 --- a/src/ShapeCustom/ShapeCustom_Surface.cxx +++ b/src/ShapeCustom/ShapeCustom_Surface.cxx @@ -205,7 +205,7 @@ Handle(Geom_Surface) ShapeCustom_Surface::ConvertToAnalytical (const Standard_Re // CKY 3-FEV-1997 : verification du sens de description //gp_Dir AXY = aAx3.YDirection(); // AXY not used (skl) if (aAx3.YDirection().Dot (origD1U) < 0) { -#ifdef DEBUG +#ifdef SHAPECUSTOM_DEB cout<<" Surface Analytique : sens a inverser"<UReverse(); anObject->D1 (0.,0.,resPnt,resD1U,resD1V); -#ifdef DEBUG +#ifdef SHAPECUSTOM_DEB if (resD1U.Dot(origD1U) < 0 && j != 2) cout<<" Tore a inverser !"<Value (Curve(i)->LastParameter()).IsEqual (Curve (i + 1)->Value (Curve(i + 1)->FirstParameter()), Preci); } -#ifdef DEB +#ifdef SHAPEEXTEND_DEB if (!ok) cout << "Warning: ShapeExtend_ComplexCurve: not connected in 3d" << endl; #endif return ok; diff --git a/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx b/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx index 2e1bbd775e..1ca9a7d820 100644 --- a/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx +++ b/src/ShapeExtend/ShapeExtend_CompositeSurface.cxx @@ -79,7 +79,7 @@ Standard_Boolean ShapeExtend_CompositeSurface::Init (const Handle(TColGeom_HArra if ( ! SetUJointValues ( UJoints ) || ! SetVJointValues ( VJoints ) ) { ok = Standard_False; ComputeJointValues ( ShapeExtend_Natural ); -#ifdef DEB +#ifdef SHAPEEXTEND_DEB cout << "Warning: ShapeExtend_CompositeSurface::Init: bad joint values" << endl; #endif } @@ -826,7 +826,7 @@ Standard_Boolean ShapeExtend_CompositeSurface::CheckConnectivity (const Standard else if ( maxdist2 > Prec*Prec ) ok = Standard_False; } -#ifdef DEB +#ifdef SHAPEEXTEND_DEB if ( ! ok ) cout << "Warning: ShapeExtend_CompositeSurface: not connected in 3d" << endl; #endif return ok; diff --git a/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx b/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx index 8eaca8ddbf..bdaa4fddb7 100644 --- a/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx +++ b/src/ShapeExtend/ShapeExtend_MsgRegistrator.cxx @@ -35,7 +35,7 @@ void ShapeExtend_MsgRegistrator::Send(const Handle(Standard_Transient)& object, const Message_Gravity) { if (object.IsNull()) { -#ifdef DEB +#ifdef SHAPEEXTEND_DEB cout << "Warning: ShapeExtend_MsgRegistrator::Send: null object" << endl; #endif return; @@ -61,7 +61,7 @@ void ShapeExtend_MsgRegistrator::Send(const Handle(Standard_Transient)& object, const Message_Gravity) { if (shape.IsNull()) { -#ifdef DEB +#ifdef SHAPEEXTEND_DEB cout << "Warning: ShapeExtend_MsgRegistrator::Send: null shape" << endl; #endif return; diff --git a/src/ShapeFix/ShapeFix.cxx b/src/ShapeFix/ShapeFix.cxx index 816ccc3520..0865a81634 100644 --- a/src/ShapeFix/ShapeFix.cxx +++ b/src/ShapeFix/ShapeFix.cxx @@ -215,7 +215,7 @@ Standard_Boolean ShapeFix::SameParameter(const TopoDS_Shape& shape, } if (!status) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout<<"** SameParameter not complete. On "< 0) cout<<" "<Print ( cout ); cout << endl; diff --git a/src/ShapeFix/ShapeFix_ComposeShell.cxx b/src/ShapeFix/ShapeFix_ComposeShell.cxx index 2807a627ba..976966f7fb 100644 --- a/src/ShapeFix/ShapeFix_ComposeShell.cxx +++ b/src/ShapeFix/ShapeFix_ComposeShell.cxx @@ -377,7 +377,7 @@ static Standard_Integer ApplyContext (ShapeFix_WireSegment &wire, for ( TopoDS_Iterator it(res); it.More(); it.Next() ) { TopoDS_Edge E = TopoDS::Edge ( it.Value() ); if ( ! E.IsNull() ) segw->Add ( E ); -#ifdef DEB +#ifdef SHAPEFIX_DEB else cout << "Error: ShapeFix_ComposeShell, ApplyContext: wrong mapping of edge" << endl; #endif } @@ -394,7 +394,7 @@ static Standard_Integer ApplyContext (ShapeFix_WireSegment &wire, else wire.AddEdge ( index, aE, iumin, iumax, ivmin, ivmax ); } } -#ifdef DEB +#ifdef SHAPEFIX_DEB else cout << "Warning: ShapeFix_ComposeShell, ApplyContext: edge is to remove - not implemented" << endl; #endif @@ -703,7 +703,7 @@ Standard_Integer ShapeFix_ComposeShell::ComputeCode (const Handle(ShapeExtend_Wi else if ( code == IOR_BOTH ) { // parity error in intersector code = IOR_LEFT; myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL2 ); -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_ComposeShell::ComputeCode: lost intersection point" << endl; #endif } @@ -841,7 +841,7 @@ ShapeFix_WireSegment ShapeFix_ComposeShell::SplitWire (ShapeFix_WireSegment &wir if ( nsplit !=1 ) { DistributeSplitPoints ( wire.WireData(), myFace, i, nsplit, indexes, values ); if ( nsplit <=0 ) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Error: ShapeFix_ComposeShell::SplitWire: edge dismissed" << endl; #endif i--; @@ -1630,7 +1630,7 @@ void ShapeFix_ComposeShell::SplitByLine (ShapeFix_SequenceOfWireSegment &wires, } if ( tanglevel <0 ) { // myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL4 ); -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_ComposeShell::SplitByLine: tangency level <0 !" << endl; #endif } @@ -1645,7 +1645,7 @@ void ShapeFix_ComposeShell::SplitByLine (ShapeFix_SequenceOfWireSegment &wires, // protection against creating null-length edges if ( SplitLinePar(i) - SplitLinePar(i-1) < ::Precision::PConfusion() ) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Info: ShapeFix_ComposeShell::SplitByLine: Short segment ignored" << endl; #endif if ( ! V1.IsSame ( V2 ) ) { // merge coincident vertices @@ -1654,7 +1654,7 @@ void ShapeFix_ComposeShell::SplitByLine (ShapeFix_SequenceOfWireSegment &wires, Context()->Replace ( V1, V.Oriented ( V1.Orientation() ) ); Context()->Replace ( V2, V.Oriented ( V2.Orientation() ) ); V1 = V2 = V; -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Info: ShapeFix_ComposeShell::SplitByLine: Coincided vertices merged" << endl; #endif } @@ -1697,7 +1697,7 @@ void ShapeFix_ComposeShell::SplitByLine (ShapeFix_SequenceOfWireSegment &wires, } if ( parity % 2 ) { myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL4 ); -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Error: ShapeFix_ComposeShell::SplitByLine: parity error" << endl; #endif } @@ -1982,10 +1982,12 @@ void ShapeFix_ComposeShell::CollectWires (ShapeFix_SequenceOfWireSegment &wires, i--; continue; } -#ifdef DEB +#ifdef SHAPEFIX_DEB for ( Standard_Integer k=1; ! myClosedMode && k <= seqw(i).NbEdges(); k++ ) - if ( ! seqw(i).CheckPatchIndex ( k ) ) {;} //break; -// cout << "Warning: ShapeFix_ComposeShell::CollectWires: Wrong patch indices" << endl; + if ( ! seqw(i).CheckPatchIndex ( k ) ) { + cout << "Warning: ShapeFix_ComposeShell::CollectWires: Wrong patch indices" << endl; + break; + } #endif Standard_Integer isshort = IsShortSegment ( seqw(i), myFace, myGrid, myLoc, myUResolution, myVResolution ); @@ -1994,7 +1996,7 @@ void ShapeFix_ComposeShell::CollectWires (ShapeFix_SequenceOfWireSegment &wires, ( seqw(i).Orientation() == TopAbs_EXTERNAL || ( seqw(i).NbEdges() == 1 && //:abv 13.05.02: OCC320 - remove if degenerated BRep_Tool::Degenerated ( seqw(i).Edge(1) ) ) ) ) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Info: ShapeFix_ComposeShell::CollectWires: Short segment ignored" << endl; #endif seqw(i).Orientation ( TopAbs_INTERNAL ); @@ -2195,7 +2197,7 @@ void ShapeFix_ComposeShell::CollectWires (ShapeFix_SequenceOfWireSegment &wires, IsCoincided ( endPnt, firstPnt, myUResolution, myVResolution, 2.* tol ) ) ) { if ( ! endV.IsSame ( sae.FirstVertex ( firstEdge ) ) ) { myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL5 ); -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_ComposeShell::CollectWires: can't close wire" << endl; #endif } @@ -2252,7 +2254,7 @@ void ShapeFix_ComposeShell::CollectWires (ShapeFix_SequenceOfWireSegment &wires, //pdn add into resulting sequence! ShapeFix_WireSegment s ( wd, TopAbs_FORWARD ); wires.Append ( s ); -#ifdef DEB +#ifdef SHAPEFIX_DEB cout <<"Warning: Short segment processed as separate wire"<0 ) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Error: ShapeFix_ComposeShell::MakeFacesOnPatch: can't dispatch wires" << endl; #endif for ( Standard_Integer j=1; j <= loops.Length(); j++ ) { @@ -2459,7 +2461,7 @@ void ShapeFix_ComposeShell::MakeFacesOnPatch (TopTools_SequenceOfShape &faces, BRepTopAdaptor_FClass2d clas ( fc, ::Precision::PConfusion() ); if ( clas.PerformInfinitePoint() == TopAbs_IN ) { reverse = Standard_True; -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_ComposeShell::MakeFacesOnPatch: badly oriented wire" << endl; #endif } @@ -2511,7 +2513,7 @@ void ShapeFix_ComposeShell::MakeFacesOnPatch (TopTools_SequenceOfShape &faces, // check for lost wires, and if they are, make them roots if ( i == roots.Length() && loops.Length() >0 ) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Error: ShapeFix_ComposeShell::MakeFacesOnPatch: can't dispatch wires" << endl; #endif for ( j=1; j <= loops.Length(); j++ ) { diff --git a/src/ShapeFix/ShapeFix_Edge.cxx b/src/ShapeFix/ShapeFix_Edge.cxx index d141b0c93c..b874419cc0 100644 --- a/src/ShapeFix/ShapeFix_Edge.cxx +++ b/src/ShapeFix/ShapeFix_Edge.cxx @@ -254,7 +254,7 @@ static Handle(Geom2d_Curve) TranslatePCurve (const Handle(Geom_Surface)& aSurf, } */ // Other case not yet implemented -#ifdef DEBUG +#ifdef SHAPEFIX_DEB cout << "TranslatePCurve not performed" << endl; #endif return theNewL2d;//*theL2d; @@ -264,7 +264,7 @@ static Handle(Geom2d_Curve) TranslatePCurve (const Handle(Geom_Surface)& aSurf, Handle(Geom2d_BSplineCurve) aBC = Handle(Geom2d_BSplineCurve)::DownCast(aC2d); if (aBC.IsNull()) { -#ifdef DEBUG +#ifdef SHAPEFIX_DEB cout << "Untreated curve type in TranslatePCurve" << endl; #endif return aC2d; @@ -304,9 +304,6 @@ static Handle(Geom2d_Curve) TranslatePCurve (const Handle(Geom_Surface)& aSurf, } */ else if (theVector.IsParallel(VectIsoVF, aTol)) { -//#ifdef DEBUG -// cout << "other curve-VClosed Surface. TranslatePC not impl." << endl; -//#endif if (Abs(FirstPoint.Y() - vf) < Abs(FirstPoint.Y() - vl)) T.SetTranslation(p00, p01); else T.SetTranslation(p01, p00); newC->Transform(T); @@ -593,7 +590,7 @@ Standard_Boolean ShapeFix_Edge::FixAddPCurve (const TopoDS_Edge& edge, } // end try catch(Standard_Failure) { myStatus |= ShapeExtend::EncodeStatus (ShapeExtend_FAIL2); -#ifdef DEB //:s5 +#ifdef SHAPEFIX_DEB //:s5 cout << "Warning: ShapeFix_Edge::FixAddPCurve(): Exception: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -778,7 +775,7 @@ Standard_Boolean ShapeFix_Edge::FixSameParameter(const TopoDS_Edge& edge, } } catch(Standard_Failure) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "\nWarning: ShapeFix_Edge: Exception in SameParameter: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif diff --git a/src/ShapeFix/ShapeFix_EdgeProjAux.cxx b/src/ShapeFix/ShapeFix_EdgeProjAux.cxx index 115f950e41..cd68c1302a 100644 --- a/src/ShapeFix/ShapeFix_EdgeProjAux.cxx +++ b/src/ShapeFix/ShapeFix_EdgeProjAux.cxx @@ -99,7 +99,7 @@ void ShapeFix_EdgeProjAux::Compute (const Standard_Real preci) Standard_Real U1 = FirstParam(); Standard_Real U2 = LastParam(); if (U1>=U2) { -#ifdef DEBUG +#ifdef SHAPEFIX_DEB cout << "Parametres inverses ... " << endl; #endif Standard_Real tmp = U1; @@ -209,7 +209,7 @@ static Standard_Boolean FindParameterWithExt (const gp_Pnt& Pt1, else return Standard_False; } // end try catch(Standard_Failure) { -#ifdef DEB //:s5 +#ifdef SHAPEFIX_DEB //:s5 cout << "Warning: ShapeFix_EdgeProjAux, FindParameterWithExt(): Exception: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -264,7 +264,7 @@ void ShapeFix_EdgeProjAux::Init2d (const Standard_Real preci) return; } } -#ifdef DEBUG +#ifdef SHAPEFIX_DEB else cout <<"Other type of deg curve"<ReversedParameter(Usup); myLastParam = theCurve2d->ReversedParameter(Uinf); theCurve2d->Reverse(); -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_EdgeProjAux: pcurve reversed" << endl; #endif return; @@ -432,7 +432,7 @@ void ShapeFix_EdgeProjAux::Init2d (const Standard_Real preci) UpdateParam2d(theCurve2d); else { myLastParam+=period; -#ifdef DEBUG +#ifdef SHAPEFIX_DEB cout <<" Added"< wmid) { myLastParam -=period; UpdateParam2d(theCurve2d); -#ifdef DEBUG +#ifdef SHAPEFIX_DEB cout <<" Added & Inverted"<1) { -#ifdef DEBUG +#ifdef SHAPEFIX_DEB cout<<"Wire was splitted on "<Wire() ); SendWarning ( sbdw->Wire(), Message_Msg ( "FixAdvFace.FixOrientation.MSG5" ) );// Wire on face was reversed done = Standard_True; -#ifdef DEBUG +#ifdef SHAPEFIX_DEB cout<<"Wire reversed"<Replace ( myFace, face ); @@ -2095,7 +2095,7 @@ Standard_Boolean ShapeFix_Face::FixLoopWire(TopTools_SequenceOfShape& aResWires) Standard_Boolean isDone =(aResWires.Length() && isClosed); if(isDone && aResWires.Length() >1) { -#ifdef DEBUG +#ifdef SHAPEFIX_DEB cout<<"Wire was splitted on "<Apply(result); result = TopoDS::Shell(tmpReShape); if (theReShape->Status(ShapeExtend_OK)) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout<<"Warning: ShapeFix_FaceConnect::Build: Edges not replaced by ReShape"<Status(ShapeExtend_FAIL1)) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout<<"Error: ShapeFix_FaceConnect::Build: ReShape failed on edges"<Status(ShapeExtend_FAIL1)) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout<<"Error: ShapeFix_FaceConnect::Build: ReShape failed on vertices"<Print(cout); cout << endl; #endif @@ -294,7 +294,7 @@ static Standard_Boolean CreateSolids(const TopoDS_Shape aShape,TopTools_IndexedM infinstatus = bsc3d.State(); } catch(Standard_Failure) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_Solid::SolidFromShell: Exception: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -553,7 +553,7 @@ TopoDS_Solid ShapeFix_Solid::SolidFromShell (const TopoDS_Shell& shell) } } catch(Standard_Failure) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_Solid::SolidFromShell: Exception: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif diff --git a/src/ShapeFix/ShapeFix_Wire.cxx b/src/ShapeFix/ShapeFix_Wire.cxx index 8e5a98f7b6..312e5ee656 100644 --- a/src/ShapeFix/ShapeFix_Wire.cxx +++ b/src/ShapeFix/ShapeFix_Wire.cxx @@ -566,7 +566,7 @@ Standard_Boolean ShapeFix_Wire::FixEdgeCurves() } } if ( seq.Length() >0 ) { // supposed that edge is SP -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Edge going over singularity detected; splitted" << endl; #endif Standard_Boolean isFwd = ( E.Orientation() == TopAbs_FORWARD ); @@ -655,7 +655,7 @@ Standard_Boolean ShapeFix_Wire::FixEdgeCurves() myFixEdge->Projector()->AdjustOverDegenMode() = Standard_False; myFixEdge->FixAddPCurve ( sbwd->Edge(overdegen), face, sbwd->IsSeam(overdegen), myAnalyzer->Surface(), Precision()); } -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Edge going over singularity detected; pcurve adjusted" << endl; #endif } @@ -860,7 +860,7 @@ Standard_Boolean ShapeFix_Wire::FixSelfIntersection() myStatusSelfIntersection |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE3 ); num = ( myClosedMode ? 1 : 2 ); nb = sbwd->NbEdges(); -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_Wire::FixSelfIntersection: Edge removed" << endl; #endif } @@ -889,7 +889,7 @@ Standard_Boolean ShapeFix_Wire::FixSelfIntersection() if ( ! Context().IsNull() ) UpdateWire(); myShape.Nullify(); } -#ifdef DEB +#ifdef SHAPEFIX_DEB if (StatusSelfIntersection (ShapeExtend_DONE5)) cout<<"Warning: ShapeFix_Wire::FixIntersection: Non-adjacent intersection fixed (split-" <Period(); IsVCrvClosed = Standard_True; -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_Wire::FixShifted set vclosed True for Surface of Revolution" << endl; #endif } @@ -1444,7 +1444,7 @@ Standard_Boolean ShapeFix_Wire::FixShifted() UpdateEdgeUVPoints ( edge, Face() ); } myLastFixStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE1 ); -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Info: ShapeFix_Wire::FixShifted(): bi - meridian case fixed" << endl; #endif continue; @@ -1740,14 +1740,14 @@ static Standard_Boolean RemoveLoop (TopoDS_Edge &E, const TopoDS_Face &face, if ( ! sae.PCurve ( E, face, c2d, a, b, Standard_False ) ) return Standard_False; -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Cut Loop: params (" << t1 << ", " << t2; #endif GeomAdaptor_Curve GAC ( crv, f, l ); Standard_Real dt = tolfact * GAC.Resolution(prec); t1 -= dt; //1e-3;//::Precision::PConfusion(); t2 += dt; //1e-3;//::Precision::PConfusion(); -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << ") -> (" << t1 << ", " << t2 << ")" << endl; #endif @@ -1817,7 +1817,7 @@ static Standard_Boolean RemoveLoop (TopoDS_Edge &E, const TopoDS_Face &face, if ( ! TryNewPCurve ( E, face, bs, a, b, newtol ) ) return Standard_False; Standard_Real tol = BRep_Tool::Tolerance ( E ); -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Cut Loop: tol orig " << tol << ", prec " << prec << ", new tol " << newtol << endl; #endif if ( newtol > Max ( prec, tol ) ) return Standard_False; @@ -1927,7 +1927,7 @@ static Standard_Boolean RemoveLoop (TopoDS_Edge &E, const TopoDS_Face &face, TopoDS_Edge &E1, TopoDS_Edge &E2) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout<<"Info: ShapeFix_Wire::FixSelfIntersection : Try insert vertex"<Value(i) < iumin ) myIUMin->SetValue ( i, iumin ); -#ifdef DEB +#ifdef SHAPEFIX_DEB if ( myIUMin->Value(i) > myIUMax->Value(i) ) cout << "Warning: ShapeFix_WireSegment::DefineIUMin: indexation error" << endl; #endif @@ -253,7 +253,7 @@ void ShapeFix_WireSegment::DefineIUMax (const Standard_Integer i, const Standard_Integer iumax) { if ( myIUMax->Value(i) > iumax ) myIUMax->SetValue ( i, iumax ); -#ifdef DEB +#ifdef SHAPEFIX_DEB Standard_Integer iun = myIUMin->Value(i), iux = myIUMax->Value(i); if ( iun > iux ) cout << "Warning: ShapeFix_WireSegment::DefineIUMax: indexation error" << endl; @@ -269,7 +269,7 @@ void ShapeFix_WireSegment::DefineIVMin (const Standard_Integer i, const Standard_Integer ivmin) { if ( myIVMin->Value(i) < ivmin ) myIVMin->SetValue ( i, ivmin ); -#ifdef DEB +#ifdef SHAPEFIX_DEB Standard_Integer ivn = myIVMin->Value(i), ivx = myIVMax->Value(i); if ( ivn > ivx ) cout << "Warning: ShapeFix_WireSegment::DefineIVMin: indexation error" << endl; @@ -285,7 +285,7 @@ void ShapeFix_WireSegment::DefineIVMax (const Standard_Integer i, const Standard_Integer ivmax) { if ( myIVMax->Value(i) > ivmax ) myIVMax->SetValue ( i, ivmax ); -#ifdef DEB +#ifdef SHAPEFIX_DEB Standard_Integer ivn = myIVMin->Value(i), ivx = myIVMax->Value(i); if ( ivn > ivx ) cout << "Warning: ShapeFix_WireSegment::DefineIVMax: indexation error" << endl; @@ -319,7 +319,7 @@ Standard_Boolean ShapeFix_WireSegment::CheckPatchIndex (const Standard_Integer i Standard_Integer dU = myIUMax->Value(i) - myIUMin->Value(i); Standard_Integer dV = myIVMax->Value(i) - myIVMin->Value(i); Standard_Boolean ok = ( dU ==0 || dU ==1 ) && ( dV ==0 || dV ==1 ); -#ifdef DEB +#ifdef SHAPEFIX_DEB if ( ! ok ) cout << "Warning: ShapeFix_WireSegment::CheckPatchIndex: incomplete indexation" << endl; #endif diff --git a/src/ShapeFix/ShapeFix_Wire_1.cxx b/src/ShapeFix/ShapeFix_Wire_1.cxx index ff734aa509..d618fe03d9 100644 --- a/src/ShapeFix/ShapeFix_Wire_1.cxx +++ b/src/ShapeFix/ShapeFix_Wire_1.cxx @@ -360,7 +360,7 @@ static Standard_Real AdjustOnPeriodic3d (const Handle(Geom_Curve)& c, } catch (Standard_Failure) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_Wire_1::FixGap3d: Exception in TrimmedCurve" <Print(cout); cout << endl; #endif @@ -635,7 +635,7 @@ static Standard_Real AdjustOnPeriodic3d (const Handle(Geom_Curve)& c, } catch (Standard_Failure) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_Wire_1::FixGap3d: Exception in TrimmedCurve :"<Print(cout); cout << endl; #endif @@ -943,7 +943,7 @@ static Standard_Real AdjustOnPeriodic2d (const Handle(Geom2d_Curve)& pc, } catch (Standard_Failure) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_Wire_1::FixGap2d: Exception in TrimmedCurve2d" <Print(cout); cout << endl; #endif @@ -1523,7 +1523,7 @@ static Standard_Real AdjustOnPeriodic2d (const Handle(Geom2d_Curve)& pc, catch (Standard_Failure) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout << "Warning: ShapeFix_Wire_1::FixGap2d: Exception in TrimmedCurve2d :"<Print(cout); cout << endl; #endif diff --git a/src/ShapeFix/ShapeFix_Wireframe.cxx b/src/ShapeFix/ShapeFix_Wireframe.cxx index 508d5470d6..6af6abe316 100644 --- a/src/ShapeFix/ShapeFix_Wireframe.cxx +++ b/src/ShapeFix/ShapeFix_Wireframe.cxx @@ -385,7 +385,7 @@ ShapeFix_Wireframe::ShapeFix_Wireframe(const TopoDS_Shape& shape) } catch ( Standard_Failure ) { -#ifdef DEB +#ifdef SHAPEFIX_DEB cout<<"Error: ShapeFix_Wireframe::FixSmallEdges: JoinEdges: Exception in GeomConvert_CompCurveToBSplineCurve: "; Standard_Failure::Caught()->Print(cout); cout<HasItem ( name, Standard_True ) ) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout << "Warning: operator with name " << name << " is already registered!" << endl; #endif return Standard_False; @@ -57,7 +57,7 @@ Standard_Boolean ShapeProcess::FindOperator (const Standard_CString name, { if ( dic.IsNull() ) dic = new ShapeProcess_DictionaryOfOperator; if ( ! dic->HasItem ( name, Standard_True ) ) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout << "Error: no operator with name " << name << " registered!" << endl; #endif return Standard_False; @@ -79,7 +79,7 @@ Standard_Boolean ShapeProcess::Perform (const Handle(ShapeProcess_Context)& cont // get description of the sequence TCollection_AsciiString sequence; if ( ! context->GetString ( "exec.op", sequence ) ) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout << "Error: ShapeProcess_Performer::Perform: sequence not defined for " << seq << endl; #endif context->UnSetScope(); diff --git a/src/ShapeProcess/ShapeProcess_Context.cxx b/src/ShapeProcess/ShapeProcess_Context.cxx index 8f1727bc8e..3c3c98bb2c 100644 --- a/src/ShapeProcess/ShapeProcess_Context.cxx +++ b/src/ShapeProcess/ShapeProcess_Context.cxx @@ -83,7 +83,7 @@ Handle(Resource_Manager) ShapeProcess_Context::LoadResourceManager (const Standa } } if ( sRC.IsNull() ) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout << "Info: ShapeProcess_Context: Reload Resource_Manager: " << name.ToCString() << " -> " << file << endl; #endif @@ -166,7 +166,7 @@ Standard_Boolean ShapeProcess_Context::GetString (const Standard_CString param, if ( myRC.IsNull() ) return Standard_False; Handle(TCollection_HAsciiString) pname = MakeName ( myScope, param ); if ( ! myRC->Find ( pname->ToCString() ) ) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout << "Warning: ShapeProcess_Context::GetInteger(): Parameter " << pname->ToCString() << " is not defined" << endl; #endif return Standard_False; @@ -200,7 +200,7 @@ Standard_Boolean ShapeProcess_Context::GetReal (const Standard_CString param, ref.LeftAdjust(); ref.RightAdjust(); if ( ! myRC->Find ( ref.ToCString() ) ) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout << "Warning: ShapeProcess_Context::GetInteger(): Parameter " << ref.ToCString() << " is not defined" << endl; #endif return Standard_False; @@ -211,7 +211,7 @@ Standard_Boolean ShapeProcess_Context::GetReal (const Standard_CString param, return Standard_True; } } -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout << "Warning: ShapeProcess_Context::GetInteger(): Parameter " << param << " is neither Real nor reference to Real"; #endif return Standard_False; @@ -242,7 +242,7 @@ Standard_Boolean ShapeProcess_Context::GetInteger (const Standard_CString param, ref.LeftAdjust(); ref.RightAdjust(); if ( ! myRC->Find ( ref.ToCString() ) ) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout << "Warning: ShapeProcess_Context::GetInteger(): Parameter " << ref.ToCString() << " is not defined" << endl; #endif return Standard_False; @@ -253,7 +253,7 @@ Standard_Boolean ShapeProcess_Context::GetInteger (const Standard_CString param, return Standard_True; } } -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout << "Warning: ShapeProcess_Context::GetInteger(): Parameter " << param << " is neither Integer nor reference to Integer"; #endif return Standard_False; @@ -274,7 +274,7 @@ Standard_Boolean ShapeProcess_Context::GetBoolean (const Standard_CString param, return Standard_True; } catch (Standard_Failure) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout << "Warning: ShapeProcess_Context::GetInteger(): " << param << ": "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -332,7 +332,7 @@ Standard_CString ShapeProcess_Context::StringVal (const Standard_CString param, return myRC->Value ( MakeName ( myScope, param )->ToCString() ); } catch (Standard_Failure) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout << "Warning: ShapeProcess_Context::GetInteger(): " << param << ": "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif diff --git a/src/ShapeProcess/ShapeProcess_OperLibrary.cxx b/src/ShapeProcess/ShapeProcess_OperLibrary.cxx index 1821ff45b5..e64e53651e 100644 --- a/src/ShapeProcess/ShapeProcess_OperLibrary.cxx +++ b/src/ShapeProcess/ShapeProcess_OperLibrary.cxx @@ -186,7 +186,7 @@ static Standard_Boolean splitangle (const Handle(ShapeProcess_Context)& context) SDA.SetMaxTolerance ( ctx->RealVal ( "MaxTolerance", 1. ) ); if ( ! SDA.Perform() && SDA.Status (ShapeExtend_FAIL) ) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout<<"ShapeDivideAngle failed"<GetBoolean ( "EdgeMode", EdgeMode ) ) SCB.SetEdgeMode(EdgeMode); if ( ! SCB.Perform() && SCB.Status (ShapeExtend_FAIL) ) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout<<"Shape::ShapeConvertToBezier failed"<GetReal ( "MaxTolerance", maxTol ) ) tool.SetMaxTolerance(maxTol); if ( ! tool.Perform() && tool.Status (ShapeExtend_FAIL) ) { -#ifdef DEB +#ifdef SHAPEPROCESS_DEB cout<<"SplitContinuity failed"<Append(val); isUSplit = Standard_True; } -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB else cout << "Warning: SU_ClosedFaceDivide: Thin face, not splitted" << endl; #endif } @@ -197,7 +197,7 @@ Standard_Boolean ShapeUpgrade_ClosedFaceDivide::SplitSurface() split->Append(val); isUSplit = Standard_False; } -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB else cout << "Warning: SU_ClosedFaceDivide: Thin face, not splitted" << endl; #endif } diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx index 2cd7be6224..9c354c35f3 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertCurve2dToBezier.cxx @@ -155,14 +155,14 @@ void ShapeUpgrade_ConvertCurve2dToBezier::Compute() if(Abs(Last-bl) < precision) Last = bl; if(First < bf){ -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout <<"Warning: The range of the edge exceeds the pcurve domain" <SetValue(1,First); } if(Last > bl){ -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout <<"Warning: The range of the edge exceeds the pcurve domain" <SetValue(1,First); } if(Last > bl){ -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout <<"Warning: The range of the edge exceeds the curve domain" <Segment(V1,V2); } else { -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout <<"Warning: Resulting path is not surface of revolution basis on bezier curve"<Print(cout); cout << endl; #endif @@ -113,7 +113,7 @@ Standard_Boolean ShapeUpgrade_FixSmallBezierCurves::Approx(Handle(Geom_Curve)& C } } catch (Standard_Failure) { -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout << "Warning: ShapeUpgrade_FixSmallBezierCurve::Approx(): Exception in Segment :"; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -150,7 +150,7 @@ Standard_Boolean ShapeUpgrade_FixSmallBezierCurves::Approx(Handle(Geom_Curve)& C } } catch (Standard_Failure) { -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout << "Warning: ShapeUpgrade_FixSmallBezierCurve::Approx(): Exception in Segment :"; Standard_Failure::Caught()->Print(cout); cout << endl; #endif diff --git a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx index 1177b79803..546b4bf6fa 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.cxx @@ -215,7 +215,7 @@ Standard_Boolean ShapeUpgrade_ShapeDivide::Perform(const Standard_Boolean newCon } catch (Standard_Failure) { myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL2 ); -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout << "\nError: Exception in ShapeUpgrade_FaceDivide::Perform(): "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx index bedb81ac53..ff33124fdc 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cxx @@ -76,13 +76,13 @@ ShapeUpgrade_SplitCurve2d::ShapeUpgrade_SplitCurve2d() if(Abs(lastPar-lP) < precision) lastPar = lP; if(firstPar < fP){ -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout <<"Warning: The range of the edge exceeds the curve domain" < lP){ -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout <<"Warning: The range of the edge exceeds the curve domain" <Segment (First, Last); } catch (Standard_Failure) { -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout << "Warning: ShapeUpgrade_Split2dCurve::Build(): Exception in Segment :"; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -224,7 +224,7 @@ ShapeUpgrade_SplitCurve2d::ShapeUpgrade_SplitCurve2d() myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE3 ); } catch (Standard_Failure) { -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout << "Warning: ShapeUpgrade_Split2dCurve::Build(): Exception in Segment :"; Standard_Failure::Caught()->Print(cout); cout << endl; #endif diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx index 6ac5689fd6..0fe6e0d5b8 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2dContinuity.cxx @@ -105,7 +105,7 @@ void ShapeUpgrade_SplitCurve2dContinuity::Compute() case GeomAbs_C1 : BasCriterion = GeomAbs_C2; break; case GeomAbs_C2 : BasCriterion = GeomAbs_C3; break; case GeomAbs_C3 : //if (ShapeUpgrade::Debug()) cout<<". this criterion is not suitable for a Offset curve"< lP){ -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout <<"Warning: The range of the edge exceeds the curve domain" <SetValue(1,First); } if(Last > lastPar){ -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout <<"Warning: The range of the edge exceeds the curve domain" <Print(cout); cout << endl; #endif diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx index e72607ded3..c5fe59f5ab 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3dContinuity.cxx @@ -103,7 +103,7 @@ void ShapeUpgrade_SplitCurve3dContinuity::Compute() case GeomAbs_C1 : BasCriterion = GeomAbs_C2; break; case GeomAbs_C2 : BasCriterion = GeomAbs_C3; break; case GeomAbs_C3 : // if (ShapeUpgrade::Debug()) cout<<". this criterion is not suitable for a Offset curve"<Print(cout); cout << endl; #endif diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx index df0bbb63c1..b91fda05f7 100644 --- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx +++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cxx @@ -173,7 +173,7 @@ ShapeUpgrade_SplitSurfaceContinuity::ShapeUpgrade_SplitSurfaceContinuity() case GeomAbs_C1 : BasCriterion = GeomAbs_C2; break; case GeomAbs_C2 : BasCriterion = GeomAbs_C3; break; case GeomAbs_C3 : //if (ShapeUpgrade::Debug()) cout<<". this criterion is not suitable for a Offset Surface"< make approximation"<SplitValues(); if(revKnots2d->Length()!=theKnots2d->Length()) { isSeam = Standard_False; -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout << "Error: ShapeUpgrade_WireDivide: seam has different splitting values on pcurvesd" << endl; #endif } @@ -447,7 +447,7 @@ void ShapeUpgrade_WireDivide::Perform () if ( !theSegments2d.IsNull() ) { Standard_Integer nbc2d = theSegments2d->Length(); if (nbc!=nbc2d) { -#ifdef DEB +#ifdef SHAPEUPGRADE_DEB cout<<"Error: Number of intervals are not equal for 2d 3d. Ignored."<= 1.) ){ Standard_NumericError::Raise("Illegal agument in ATanh"); +#ifdef STANDARD_DEB cout << "Illegal agument in ATanh" << endl ; +#endif } return atanh(Value); } @@ -248,7 +250,9 @@ Standard_Real ACosh (const Standard_Real Value) { if ( Value < 1. ){ Standard_NumericError::Raise("Illegal agument in ACosh"); +#ifdef STANDARD_DEB cout << "Illegal agument in ACosh" << endl ; +#endif } return acosh(Value); } @@ -259,7 +263,9 @@ Standard_Real ACosh (const Standard_Real Value) Standard_Real Log (const Standard_Real Value) { if ( Value <= 0. ){ Standard_NumericError::Raise("Illegal agument in Log"); +#ifdef STANDARD_DEB cout << "Illegal agument in Log" << endl ; +#endif } return log(Value); } @@ -270,7 +276,9 @@ Standard_Real Sqrt (const Standard_Real Value) { if ( Value < 0. ){ Standard_NumericError::Raise("Illegal agument in Sqrt"); +#ifdef STANDARD_DEB cout << "Illegal agument in Sqrt" << endl ; +#endif } return sqrt(Value); } diff --git a/src/StdDrivers/StdDrivers.cxx b/src/StdDrivers/StdDrivers.cxx index e5f09b9f92..33b532b801 100644 --- a/src/StdDrivers/StdDrivers.cxx +++ b/src/StdDrivers/StdDrivers.cxx @@ -32,14 +32,14 @@ static Standard_GUID StdSchemaID ("ad696002-5b34-11d1-b5ba-00a0c9064368 Handle(Standard_Transient) StdDrivers::Factory(const Standard_GUID& aGUID) { if(aGUID == StdSchemaID) { -#ifdef DEB +#ifdef STDDRIVERS_DEB cout << "StdSchema : Plugin" << endl; #endif static Handle(StdLSchema) model_ss = new StdLSchema; static Standard_Boolean aNeedNested = Standard_True; if(aNeedNested) { aNeedNested = Standard_False; -#ifdef DEB +#ifdef STDDRIVERS_DEB cout << "StdSchema: Adding nested schema" << endl; #endif Handle(StdSchema) aSchema = new StdSchema; @@ -53,14 +53,14 @@ Handle(Standard_Transient) StdDrivers::Factory(const Standard_GUID& aGUID) { } if(aGUID == StdStorageDriver) { -#ifdef DEB +#ifdef STDDRIVERS_DEB cout << "StdDrivers : Storage Plugin" << endl; #endif static Handle(StdDrivers_DocumentStorageDriver) model_sd = new StdDrivers_DocumentStorageDriver; return model_sd; } if(aGUID == StdRetrievalDriver) { -#ifdef DEB +#ifdef STDDRIVERS_DEB cout << "StdDrivers : Retrieval Plugin" << endl; #endif static Handle(StdDrivers_DocumentRetrievalDriver) model_rd = new StdDrivers_DocumentRetrievalDriver; diff --git a/src/StdLDrivers/StdLDrivers.cxx b/src/StdLDrivers/StdLDrivers.cxx index ebe0b28322..dae9f3a020 100644 --- a/src/StdLDrivers/StdLDrivers.cxx +++ b/src/StdLDrivers/StdLDrivers.cxx @@ -31,7 +31,7 @@ static Standard_GUID StdLSchemaID ("bd696002-5b34-11d1-b5ba-00a0c906436 Handle(Standard_Transient) StdLDrivers::Factory(const Standard_GUID& aGUID) { if(aGUID == StdLSchemaID) { -#ifdef DEB +#ifdef STDLDRIVERS_DEB cout << "StdLSchema : Plugin" << endl; #endif static Handle(StdLSchema) model_ss = new StdLSchema; @@ -44,14 +44,14 @@ Handle(Standard_Transient) StdLDrivers::Factory(const Standard_GUID& aGUID) { } if(aGUID == StdLStorageDriver) { -#ifdef DEB +#ifdef STDLDRIVERS_DEB cout << "StdLDrivers : Storage Plugin" << endl; #endif static Handle(StdLDrivers_DocumentStorageDriver) model_sd = new StdLDrivers_DocumentStorageDriver; return model_sd; } if(aGUID == StdLRetrievalDriver) { -#ifdef DEB +#ifdef STDLDRIVERS_DEB cout << "StdLDrivers : Retrieval Plugin" << endl; #endif static Handle(StdLDrivers_DocumentRetrievalDriver) model_rd = new StdLDrivers_DocumentRetrievalDriver; diff --git a/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx b/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx index 90896def57..cd1cbd0e9e 100644 --- a/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx +++ b/src/StdPrs/StdPrs_WFDeflectionRestrictedFace.cxx @@ -181,9 +181,11 @@ void StdPrs_WFDeflectionRestrictedFace::Add } } } +#ifdef STDPRS_DEB else { cout << "Cannot evaluate curve on surface"<FirstParameter(); @@ -454,9 +456,11 @@ Standard_Boolean StdPrs_WFDeflectionRestrictedFace::Match } } } +#ifdef STDPRS_DEB else { cout << "Cannot evaluate curve on surface"<Init(0); } else if (thescopenext->Value(numin) != 0) { -#ifdef DEB +#ifdef STEPDATA_DEB cout << "StepWriter : SetScope (scope : " << numscope << " entity : " << numin << "), Entity already in a Scope"<ClosedCurve() && CC->Degree() >1 && CC->IsClosed() ) { CC->SetPeriodic(); -//#ifdef DEB -// cout << "Warning: "__FILE__": Closed curve made periodic" << endl; -//#endif } return Standard_True; } diff --git a/src/StepToGeom/StepToGeom_MakeBoundedCurve.cxx b/src/StepToGeom/StepToGeom_MakeBoundedCurve.cxx index 37480bbe82..4deceedd4b 100644 --- a/src/StepToGeom/StepToGeom_MakeBoundedCurve.cxx +++ b/src/StepToGeom/StepToGeom_MakeBoundedCurve.cxx @@ -81,9 +81,6 @@ Standard_Boolean StepToGeom_MakeBoundedCurve::Convert return StepToGeom_MakeBSplineCurve::Convert(BSPL,*((Handle(Geom_BSplineCurve)*)&CC)); } if (SC->IsKind(STANDARD_TYPE(StepGeom_UniformCurve))) { -//#ifdef DEBUG -// cout << "Warning : converting UniformCurve onto BSplineCurveWithKnots" << endl; -//#endif const Handle(StepGeom_UniformCurve) UC = Handle(StepGeom_UniformCurve)::DownCast(SC); const Handle(StepGeom_BSplineCurveWithKnots) BSPL = new StepGeom_BSplineCurveWithKnots; BSPL->SetDegree(UC->Degree()); @@ -104,9 +101,6 @@ Standard_Boolean StepToGeom_MakeBoundedCurve::Convert return StepToGeom_MakeBSplineCurve::Convert(BSPL,*((Handle(Geom_BSplineCurve)*)&CC)); } if (SC->IsKind(STANDARD_TYPE(StepGeom_QuasiUniformCurve))) { -//#ifdef DEBUG -// cout << "Warning : converting QuasiUniformCurve onto BSplineCurveWithKnots" << endl; -//#endif const Handle(StepGeom_QuasiUniformCurve) QUC = Handle(StepGeom_QuasiUniformCurve)::DownCast(SC); const Handle(StepGeom_BSplineCurveWithKnots) BSPL = new StepGeom_BSplineCurveWithKnots; @@ -130,9 +124,6 @@ Standard_Boolean StepToGeom_MakeBoundedCurve::Convert return StepToGeom_MakeBSplineCurve::Convert(BSPL,*((Handle(Geom_BSplineCurve)*)&CC)); } if (SC->IsKind(STANDARD_TYPE(StepGeom_UniformCurveAndRationalBSplineCurve))) { -//#ifdef DEBUG -// cout << "Warning : converting Rational UniformCurve onto BSplineCurveWithKnots" << endl; -//#endif const Handle(StepGeom_UniformCurveAndRationalBSplineCurve) RUC = Handle(StepGeom_UniformCurveAndRationalBSplineCurve)::DownCast(SC); const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve) RBSPL = @@ -152,9 +143,6 @@ Standard_Boolean StepToGeom_MakeBoundedCurve::Convert return StepToGeom_MakeBSplineCurve::Convert(RBSPL,*((Handle(Geom_BSplineCurve)*)&CC)); } if (SC->IsKind(STANDARD_TYPE(StepGeom_QuasiUniformCurveAndRationalBSplineCurve))) { -//#ifdef DEBUG -// cout << "Warning : converting Rational QuasiUniformCurve onto BSplineCurveWithKnots" << endl; -//#endif const Handle(StepGeom_QuasiUniformCurveAndRationalBSplineCurve) RQUC = Handle(StepGeom_QuasiUniformCurveAndRationalBSplineCurve)::DownCast(SC); const Handle(StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve) RBSPL = diff --git a/src/StepToGeom/StepToGeom_MakeBoundedSurface.cxx b/src/StepToGeom/StepToGeom_MakeBoundedSurface.cxx index 801cb226fa..a0ee4cb35d 100644 --- a/src/StepToGeom/StepToGeom_MakeBoundedSurface.cxx +++ b/src/StepToGeom/StepToGeom_MakeBoundedSurface.cxx @@ -96,9 +96,6 @@ Standard_Boolean StepToGeom_MakeBoundedSurface::Convert (const Handle(StepGeom_B return StepToGeom_MakeBSplineSurface::Convert(BSPL,*((Handle(Geom_BSplineSurface)*)&CS)); } if (SS->IsKind(STANDARD_TYPE(StepGeom_UniformSurface))) { -//#ifdef DEBUG -// cout << "Warning : converting UniformSurface onto BSplineSurfaceWithKnots" << endl; -//#endif const Handle(StepGeom_UniformSurface) US = Handle(StepGeom_UniformSurface)::DownCast(SS); const Handle(StepGeom_BSplineSurfaceWithKnots) BSPL = new StepGeom_BSplineSurfaceWithKnots; BSPL->SetUDegree(US->UDegree()); @@ -131,9 +128,6 @@ Standard_Boolean StepToGeom_MakeBoundedSurface::Convert (const Handle(StepGeom_B return StepToGeom_MakeBSplineSurface::Convert(BSPL,*((Handle(Geom_BSplineSurface)*)&CS)); } if (SS->IsKind(STANDARD_TYPE(StepGeom_QuasiUniformSurface))) { -//#ifdef DEBUG -// cout << "Warning : converting QuasiUniformSurface onto BSplineSurfaceWithKnots" << endl; -//#endif const Handle(StepGeom_QuasiUniformSurface) QUS = Handle(StepGeom_QuasiUniformSurface)::DownCast(SS); const Handle(StepGeom_BSplineSurfaceWithKnots) BSPL = new StepGeom_BSplineSurfaceWithKnots; @@ -171,9 +165,6 @@ Standard_Boolean StepToGeom_MakeBoundedSurface::Convert (const Handle(StepGeom_B return StepToGeom_MakeBSplineSurface::Convert(BSPL,*((Handle(Geom_BSplineSurface)*)&CS)); } if (SS->IsKind(STANDARD_TYPE(StepGeom_UniformSurfaceAndRationalBSplineSurface))) { -//#ifdef DEBUG -// cout << "Warning : converting Rational UniformSurface onto BSplineSurfaceWithKnots" << endl; -//#endif const Handle(StepGeom_UniformSurfaceAndRationalBSplineSurface) RUS = Handle(StepGeom_UniformSurfaceAndRationalBSplineSurface)::DownCast(SS); const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface) RBSPL = @@ -203,9 +194,6 @@ Standard_Boolean StepToGeom_MakeBoundedSurface::Convert (const Handle(StepGeom_B return StepToGeom_MakeBSplineSurface::Convert(RBSPL,*((Handle(Geom_BSplineSurface)*)&CS)); } if (SS->IsKind(STANDARD_TYPE(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface))) { -//#ifdef DEBUG -// cout << "Warning : converting Rational QuasiUniformSurface onto BSplineSurfaceWithKnots" << endl; -//#endif const Handle(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface) RQUS = Handle(StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface)::DownCast(SS); const Handle(StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface) RBSPL = diff --git a/src/StepToGeom/StepToGeom_MakeSurface.cxx b/src/StepToGeom/StepToGeom_MakeSurface.cxx index 4b453b0b0e..3416f3b7d0 100644 --- a/src/StepToGeom/StepToGeom_MakeSurface.cxx +++ b/src/StepToGeom/StepToGeom_MakeSurface.cxx @@ -56,9 +56,6 @@ Standard_Boolean StepToGeom_MakeSurface::Convert (const Handle(StepGeom_Surface) { // sln 01.10.2001 BUC61003. If entry shell is NULL do nothing if(SS.IsNull()) { -//#ifdef DEB -// cout<<"Warning: StepToGeom_MakeSurface: Null Surface:"; -//#endif return Standard_False; } @@ -125,7 +122,7 @@ Standard_Boolean StepToGeom_MakeSurface::Convert (const Handle(StepGeom_Surface) } catch(Standard_Failure) { // ShapeTool_DB ? -#ifdef DEB //:s5 +#ifdef STEPTOGEOM_DEB //:s5 cout<<"Warning: StepToGeom_MakeSurface: Exception:"; Standard_Failure::Caught()->Print(cout); cout << endl; #endif diff --git a/src/StepToGeom/StepToGeom_MakeTrimmedCurve.cxx b/src/StepToGeom/StepToGeom_MakeTrimmedCurve.cxx index 23657fd0ce..3e42524a44 100644 --- a/src/StepToGeom/StepToGeom_MakeTrimmedCurve.cxx +++ b/src/StepToGeom/StepToGeom_MakeTrimmedCurve.cxx @@ -259,9 +259,6 @@ Standard_Boolean StepToGeom_MakeTrimmedCurve::Convert (const Handle(StepGeom_Tri } } else { -//#ifdef DEBUG -// cout << "Trimming Failed" << endl; -//#endif return Standard_False; } } diff --git a/src/StepToGeom/StepToGeom_MakeTrimmedCurve2d.cxx b/src/StepToGeom/StepToGeom_MakeTrimmedCurve2d.cxx index 8d63046ace..7fc90d381a 100644 --- a/src/StepToGeom/StepToGeom_MakeTrimmedCurve2d.cxx +++ b/src/StepToGeom/StepToGeom_MakeTrimmedCurve2d.cxx @@ -97,8 +97,5 @@ Standard_Boolean StepToGeom_MakeTrimmedCurve2d::Convert (const Handle(StepGeom_T CC = Geom2dConvert::CurveToBSplineCurve(theTrimmed); return Standard_True; } -//#ifdef DEB -// else cout << "Warning: TrimmedCurve2d not translated" << endl; -//#endif return Standard_False; } diff --git a/src/StepToTopoDS/StepToTopoDS_GeometricTool.cxx b/src/StepToTopoDS/StepToTopoDS_GeometricTool.cxx index e9cd10bc26..f8283805e6 100644 --- a/src/StepToTopoDS/StepToTopoDS_GeometricTool.cxx +++ b/src/StepToTopoDS/StepToTopoDS_GeometricTool.cxx @@ -237,25 +237,25 @@ Standard_Boolean StepToTopoDS_GeometricTool::UpdateParam3d if (theCurve->IsKind(STANDARD_TYPE(Geom_BoundedCurve)) && !theCurve->IsClosed()) { if (w1 < cf) { -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "Update Edge First Parameter to Curve First Parameter" << endl; #endif w1 = cf; } else if (w1 > cl) { -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "Update Edge First Parameter to Curve Last Parameter" << endl; #endif w1 = cl; } if (w2 < cf) { -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "Update Edge Last Parameter to Curve First Parameter" << endl; #endif w2 = cf; } else if (w2 > cl) { -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "Update Edge Last Parameter to Curve Last Parameter" << endl; #endif w2 = cl; @@ -284,7 +284,7 @@ Standard_Boolean StepToTopoDS_GeometricTool::UpdateParam3d if ( theCurve->Value(w1).Distance(theCurve->Value(cf)) < preci ) w1 = cf; if ( theCurve->Value(w2).Distance(theCurve->Value(cl)) < preci ) w2 = cl; if ( w1 > w2 ) { -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "Warning : parameter range of edge crossing non periodic curve origin" << endl; #endif Standard_Real tmp = w1; @@ -312,7 +312,7 @@ Standard_Boolean StepToTopoDS_GeometricTool::UpdateParam3d // illegal sur une courbe fermee non periodique // on inverse quand meme les parametres !!!!!! else { -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "Warning : parameter range of edge crossing non periodic curve origin" << endl; #endif Standard_Real tmp = w1; @@ -322,7 +322,7 @@ Standard_Boolean StepToTopoDS_GeometricTool::UpdateParam3d } //abv 15.03.00 #72 bm1_pe_t4 protection of exceptions in draw else if ( w1 > w2 ) { -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "Warning: parameter range is bad; curve reversed" << endl; #endif w1 = theCurve->ReversedParameter ( w1 ); @@ -336,7 +336,7 @@ Standard_Boolean StepToTopoDS_GeometricTool::UpdateParam3d } } else { -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "UpdateParam3d Failed" << endl; cout << " - Curve Type : " << theCurve->DynamicType() << endl; cout << " - Param 1 : " << w1 << endl; @@ -344,7 +344,7 @@ Standard_Boolean StepToTopoDS_GeometricTool::UpdateParam3d #endif //abv 15.03.00 #72 bm1_pe_t4 protection of exceptions in draw if ( w1 > w2 ) { -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "Warning: parameter range is bad; curve reversed" << endl; #endif w1 = theCurve->ReversedParameter ( w1 ); diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx index 98bf1d92be..cc2269ce35 100644 --- a/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx +++ b/src/StepToTopoDS/StepToTopoDS_TranslateCompositeCurve.cxx @@ -192,7 +192,7 @@ Standard_Boolean StepToTopoDS_TranslateCompositeCurve::Init (const Handle(StepGe } } catch(Standard_Failure) { -#ifdef DEB +#ifdef STEPTOTOPODS_DEB cout << "Warning: StepToTopoDS_TranslateCompositeCurve: Exception: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -229,7 +229,7 @@ Standard_Boolean StepToTopoDS_TranslateCompositeCurve::Init (const Handle(StepGe } } catch(Standard_Failure) { -#ifdef DEB +#ifdef STEPTOTOPODS_DEB cout << "Warning: StepToTopoDS_TranslateCompositeCurve: Exception: "; Standard_Failure::Caught()->Print(cout); cout << endl; #endif diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateEdge.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateEdge.cxx index 5ee04de101..d577489de1 100644 --- a/src/StepToTopoDS/StepToTopoDS_TranslateEdge.cxx +++ b/src/StepToTopoDS/StepToTopoDS_TranslateEdge.cxx @@ -91,7 +91,7 @@ static void DecodeMakeEdgeError(const BRepLib_MakeEdge& ME, // (TP,tobind, MakeEdge(myCurve,V1,V2,U1,U2,BRepAPI::Precision()) ); // aTool.Bind (tobind,E); SURTOUT PAS : noter pour debug/erreur // } -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "------------------------------------" << endl; cout << "MakeEdge Error : " << ME.Error()<<" - "; #endif @@ -120,7 +120,7 @@ static void DecodeMakeEdgeError(const BRepLib_MakeEdge& ME, TP->AddFail(orig," Line through identic Points"); break; } -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "Original Type : " << orig->DynamicType() << endl; cout << "3D Curve Type : " << myCurve->DynamicType() << endl; cout << "First Parameter : " << U1 << endl; diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx index f4cbd87f22..daad5d736e 100644 --- a/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx +++ b/src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx @@ -149,7 +149,7 @@ static void CheckPCurves (TopoDS_Wire& aWire, const TopoDS_Face& aFace, if (w1 == w2) { RemoveSinglePCurve(myEdge,aFace); -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout<<"Removing pcuve w1=w2"<BoundsValue(i); @@ -368,7 +368,7 @@ void StepToTopoDS_TranslateFace::Init else { // Type not yet implemented or non sens TP->AddFail(Loop," Type of loop not yet implemented"); -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << Loop->DynamicType() << endl; #endif continue; diff --git a/src/StepToTopoDS/StepToTopoDS_TranslateShell.cxx b/src/StepToTopoDS/StepToTopoDS_TranslateShell.cxx index 4b4542ed37..c74e1e25fc 100644 --- a/src/StepToTopoDS/StepToTopoDS_TranslateShell.cxx +++ b/src/StepToTopoDS/StepToTopoDS_TranslateShell.cxx @@ -82,7 +82,7 @@ void StepToTopoDS_TranslateShell::Init Message_ProgressSentry PS ( TP->GetProgress(), "Face", 0, NbFc, 1 ); for (Standard_Integer i=1; i<=NbFc && PS.More(); i++, PS.Next()) { -#ifdef DEBUG +#ifdef STEPTOTOPODS_DEB cout << "Processing Face : " << i << endl; #endif StepFace = CFS->CfsFacesValue(i); diff --git a/src/StlTransfer/StlTransfer.cxx b/src/StlTransfer/StlTransfer.cxx index bd1da2c240..0f83f3f4c4 100644 --- a/src/StlTransfer/StlTransfer.cxx +++ b/src/StlTransfer/StlTransfer.cxx @@ -178,7 +178,7 @@ void StlTransfer::BuildIncrementalMesh (const TopoDS_Shape& Shape, } catch(Standard_Failure) { -#ifdef DEB +#ifdef STLTRANSFER_DEB cout << "Fail in StlTransfer::BuildIncrementalMesh" << endl; #endif } diff --git a/src/Storage/Storage_Schema.cxx b/src/Storage/Storage_Schema.cxx index f618f2cc5f..18125ce4d8 100644 --- a/src/Storage/Storage_Schema.cxx +++ b/src/Storage/Storage_Schema.cxx @@ -1536,12 +1536,20 @@ TCollection_AsciiString Storage_Schema::ICreationDate() time_t nowbin; struct tm *nowstruct; if (time(&nowbin) == (time_t)-1) + { +#ifdef STORAGE_DEB cerr << "Storage ERROR : Could not get time of day from time()" << endl; +#endif + } nowstruct = localtime(&nowbin); if (strftime(nowstr, SLENGTH, "%m/%d/%Y", nowstruct) == (size_t) 0) + { +#ifdef STORAGE_DEB cerr << "Storage ERROR : Could not get string from strftime()" << endl; +#endif + } TCollection_AsciiString t(nowstr); return t; diff --git a/src/TDF/TDF_CopyLabel.cxx b/src/TDF/TDF_CopyLabel.cxx index d12093b810..d4193c1d85 100644 --- a/src/TDF/TDF_CopyLabel.cxx +++ b/src/TDF/TDF_CopyLabel.cxx @@ -139,7 +139,7 @@ Standard_Boolean TDF_CopyLabel::ExternalReferences(const TDF_Label& L, } //======================================================================= -#ifdef DEB +#ifdef TDF_DEB static void PrintEntry(const TDF_Label& label, const Standard_Boolean allLevels) { TCollection_AsciiString entry; @@ -168,7 +168,7 @@ void TDF_CopyLabel::Perform() !TDF_Tool::IsSelfContained(mySL)) return; #endif else { -#ifdef DEB +#ifdef TDF_DEB cout << "THE SAME Data" <SetRelocation(att, att); -#ifdef DEB +#ifdef TDF_DEB PrintEntry(att->Label(), Standard_True); #endif } diff --git a/src/TDF/TDF_Delta.cxx b/src/TDF/TDF_Delta.cxx index 36fce3bf2b..1f20c7e741 100644 --- a/src/TDF/TDF_Delta.cxx +++ b/src/TDF/TDF_Delta.cxx @@ -108,7 +108,7 @@ void TDF_Delta::BeforeOrAfterApply(const Standard_Boolean before) const } if (!noDeadLock) { -#ifdef DEB +#ifdef TDF_DEB if (before) cout<<"Before"; else cout<<"After"; cout<<"Undo(): dead lock between these attributes:"<mySavedTransaction = 0; -#ifdef DEB +#ifdef TDF_DEB cout<<"Resume attribute"<RemoveArray(); -#ifdef DEB +#ifdef TDATASTD_DEB if(OldAtt->InternalArray().IsNull()) cout << "BackUp Arr is Nullified" << endl; #endif @@ -99,7 +99,7 @@ void TDataStd_DeltaOnModificationOfByteArray::Apply() Handle(TDF_Attribute) TDFAttribute = Attribute(); Handle(TDataStd_ByteArray) BackAtt = (*((Handle(TDataStd_ByteArray)*)&TDFAttribute)); if(BackAtt.IsNull()) { -#ifdef DEB +#ifdef TDATASTD_DEB cout << "DeltaOnModificationOfByteArray::Apply: OldAtt is Null" <SetValue(i, BArr->Value(i)); if(!myIndxes.IsNull() && !myValues.IsNull()) for(i = 1; i <= myIndxes->Upper();i++) { -#ifdef DEB +#ifdef TDATASTD_DEB cout << "i = " << i << " myIndxes->Upper = " << myIndxes->Upper() << endl; cout << "myIndxes->Value(i) = " << myIndxes->Value(i) << endl; cout << "myValues->Value(i) = " << myValues->Value(i) << endl; @@ -163,7 +163,7 @@ void TDataStd_DeltaOnModificationOfByteArray::Apply() aCurAtt->myValue = byteArr; } -#ifdef DEB +#ifdef TDATASTD_DEB cout << " << Array Dump after Delta Apply >>" <InternalArray(); for(i=BArr2->Lower(); i<=BArr2->Upper() && i<= MAXUP;i++) diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx index 6ed766947f..5ab0816b0c 100644 --- a/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx +++ b/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cxx @@ -39,7 +39,7 @@ TDataStd_DeltaOnModificationOfExtStringArray::TDataStd_DeltaOnModificationOfExtS Handle(TColStd_HArray1OfExtendedString) Arr1, Arr2; Arr1 = OldAtt->Array(); Arr2 = CurrAtt->Array(); -#ifdef DEB +#ifdef TDATASTD_DEB if(Arr1.IsNull()) cout <<"DeltaOnModificationOfExtStringArray:: Old IntArray is Null" <RemoveArray(); -#ifdef DEB +#ifdef TDATASTD_DEB if(OldAtt->Array().IsNull()) cout << "BackUp Arr is Nullified" << endl; #endif @@ -98,7 +98,7 @@ void TDataStd_DeltaOnModificationOfExtStringArray::Apply() Handle(TDF_Attribute) TDFAttribute = Attribute(); Handle(TDataStd_ExtStringArray) BackAtt = (*((Handle(TDataStd_ExtStringArray)*)&TDFAttribute)); if(BackAtt.IsNull()) { -#ifdef DEB +#ifdef TDATASTD_DEB cout << "DeltaOnModificationOfExtStringArray::Apply: OldAtt is Null" <SetValue(i, aStrArr->Value(i)); if(!myIndxes.IsNull() && !myValues.IsNull()) for(i = 1; i <= myIndxes->Upper();i++) { -#ifdef DEB +#ifdef TDATASTD_DEB cout << "i = " << i << " myIndxes->Upper = " << myIndxes->Upper() << endl; cout << "myIndxes->Value(i) = " << myIndxes->Value(i) << endl; cout << "myValues->Value(i) = " << myValues->Value(i) << endl; @@ -166,7 +166,7 @@ void TDataStd_DeltaOnModificationOfExtStringArray::Apply() } -#ifdef DEB +#ifdef TDATASTD_DEB cout << " << Array Dump after Delta Apply >>" <Array(); for(i=aStrArr2->Lower(); i<= aStrArr2->Upper() && i<= MAXUP;i++) diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx index e814d40707..ec0073a7bc 100644 --- a/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx +++ b/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cxx @@ -38,7 +38,7 @@ TDataStd_DeltaOnModificationOfIntArray::TDataStd_DeltaOnModificationOfIntArray(c Handle(TColStd_HArray1OfInteger) Arr1, Arr2; Arr1 = OldAtt->Array(); Arr2 = CurrAtt->Array(); -#ifdef DEB +#ifdef TDATASTD_DEB if(Arr1.IsNull()) cout <<"DeltaOnModificationOfIntArray:: Old IntArray is Null" <RemoveArray(); -#ifdef DEB +#ifdef TDATASTD_DEB if(OldAtt->Array().IsNull()) cout << "BackUp Arr is Nullified" << endl; #endif @@ -96,7 +96,7 @@ void TDataStd_DeltaOnModificationOfIntArray::Apply() Handle(TDF_Attribute) TDFAttribute = Attribute(); Handle(TDataStd_IntegerArray) BackAtt = (*((Handle(TDataStd_IntegerArray)*)&TDFAttribute)); if(BackAtt.IsNull()) { -#ifdef DEB +#ifdef TDATASTD_DEB cout << "DeltaOnModificationOfIntArray::Apply: OldAtt is Null" <SetValue(i, IntArr->Value(i)); if(!myIndxes.IsNull() && !myValues.IsNull()) for(i = 1; i <= myIndxes->Upper();i++) { -#ifdef DEB +#ifdef TDATASTD_DEB cout << "i = " << i << " myIndxes->Upper = " << myIndxes->Upper() << endl; cout << "myIndxes->Value(i) = " << myIndxes->Value(i) << endl; cout << "myValues->Value(i) = " << myValues->Value(i) << endl; @@ -160,7 +160,7 @@ void TDataStd_DeltaOnModificationOfIntArray::Apply() aCurAtt->myValue = intArr; } -#ifdef DEB +#ifdef TDATASTD_DEB cout << " << Array Dump after Delta Apply >>" <Array(); for(i=IntArr2->Lower(); i<=IntArr2->Upper() && i <= MAXUP;i++) diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx index 5bff5f770c..ae2e72e75d 100644 --- a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx +++ b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cxx @@ -81,7 +81,7 @@ void TDataStd_DeltaOnModificationOfIntPackedMap::Apply() Handle(TDF_Attribute) aTDFAttribute = Attribute(); Handle(TDataStd_IntPackedMap) aBackAtt = (*((Handle(TDataStd_IntPackedMap)*)&aTDFAttribute)); if(aBackAtt.IsNull()) { -#ifdef DEB +#ifdef TDATASTD_DEB cout << "DeltaOnModificationOfIntPAckedMap::Apply: OldAtt is Null" <Array(); Arr2 = CurrAtt->Array(); -#ifdef DEB +#ifdef TDATASTD_DEB if(Arr1.IsNull()) cout <<"DeltaOnModificationOfRealArray:: Old Array is Null" <RemoveArray(); -#ifdef DEB +#ifdef TDATASTD_DEB if(OldAtt->Array().IsNull()) cout << "BackUp Arr is Nullified" << endl; #endif @@ -95,7 +95,7 @@ void TDataStd_DeltaOnModificationOfRealArray::Apply() Handle(TDF_Attribute) TDFAttribute = Attribute(); Handle(TDataStd_RealArray) BackAtt = (*((Handle(TDataStd_RealArray)*)&TDFAttribute)); if(BackAtt.IsNull()) { -#ifdef DEB +#ifdef TDATASTD_DEB cout << "DeltaOnModificationOfRealArray::Apply: OldAtt is Null" <SetValue(i, aRealArr->Value(i)); if(!myIndxes.IsNull() && !myValues.IsNull()) for(i = 1; i <= myIndxes->Upper();i++) { -#ifdef DEB +#ifdef TDATASTD_DEB cout << "i = " << i << " myIndxes->Upper = " << myIndxes->Upper() << endl; cout << "myIndxes->Value(i) = " << myIndxes->Value(i) << endl; cout << "myValues->Value(i) = " << myValues->Value(i) << endl; @@ -160,7 +160,7 @@ void TDataStd_DeltaOnModificationOfRealArray::Apply() } -#ifdef DEB +#ifdef TDATASTD_DEB cout << " << RealArray Dump after Delta Apply >>" <Array(); for(i=aRArr->Lower(); i<=aRArr->Upper() && i <= MAXUP;i++) diff --git a/src/TDocStd/TDocStd_Application.cxx b/src/TDocStd/TDocStd_Application.cxx index 349c3d77dd..9ea6edde91 100644 --- a/src/TDocStd/TDocStd_Application.cxx +++ b/src/TDocStd/TDocStd_Application.cxx @@ -231,7 +231,7 @@ PCDM_ReaderStatus TDocStd_Application::Open(const TCollection_ExtendedString& pa } } status = GetRetrieveStatus(); -#ifdef DEB +#ifdef TDOCSTD_DEB cout<<"TDocStd_Application::Open(): The status = "<SetSaved(); #ifdef BUC60867 -#ifdef DEB +#ifdef TDOCSTD_DEB cout<<"TDocStd_Application::SaveAs(): The status = "< NameType = " << NameTypeToString(myType) << " "; PrintEntry(aLab); #endif diff --git a/src/TNaming/TNaming_NamedShape.cxx b/src/TNaming/TNaming_NamedShape.cxx index 21b634f556..59c4c29e8b 100644 --- a/src/TNaming/TNaming_NamedShape.cxx +++ b/src/TNaming/TNaming_NamedShape.cxx @@ -885,7 +885,7 @@ TNaming_Iterator::TNaming_Iterator(const TDF_Label& Lab, } else { myNode = 0L; -#ifdef DEB +#ifdef TNAMING_DEB cout <<"TNaming_Iterator : No Shape for this label"< 2) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeDistance: 1 or 2 geometries are needed" << endl; #endif NullifyAIS(theAIS); @@ -265,7 +265,7 @@ void TPrsStd_ConstraintTools::ComputeDistance (const Handle(TDataXtd_Constraint) if (aShape1.IsNull()) { - #ifdef DEB + #ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeDistance : null shape" << endl; #endif NullifyAIS (theAIS); @@ -278,7 +278,7 @@ void TPrsStd_ConstraintTools::ComputeDistance (const Handle(TDataXtd_Constraint) if (aShape1.IsNull() || aShape2.IsNull()) { - #ifdef DEB + #ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeDistance : null shape" << endl; #endif NullifyAIS (theAIS); @@ -327,7 +327,7 @@ void TPrsStd_ConstraintTools::ComputeDistance (const Handle(TDataXtd_Constraint) { if (aShape1.ShapeType () != TopAbs_EDGE) { - #ifdef DEB + #ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeDistance : shape should be edge" << endl; #endif NullifyAIS (theAIS); @@ -474,7 +474,7 @@ void TPrsStd_ConstraintTools::ComputePerpendicular(const Handle(TDataXtd_Constra { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 2) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputePerpendicular: at leat two constraintes are needed" << endl; #endif NullifyAIS(anAIS); @@ -488,7 +488,7 @@ void TPrsStd_ConstraintTools::ComputePerpendicular(const Handle(TDataXtd_Constra if (is_planar) GetShapesAndGeom(aConst,shape1,shape2,ageom3); else GetTwoShapes(aConst,shape1,shape2); if (shape1.IsNull() || shape2.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputePerpendicular : null shape" << endl; #endif NullifyAIS(anAIS); @@ -513,7 +513,7 @@ void TPrsStd_ConstraintTools::ComputePerpendicular(const Handle(TDataXtd_Constra if (is_planar) { Handle(Geom_Plane) aplane = Handle(Geom_Plane)::DownCast(ageom3); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputePerpendicular: nul plane" << endl; #endif NullifyAIS(anAIS); @@ -533,7 +533,7 @@ void TPrsStd_ConstraintTools::ComputeParallel(const Handle(TDataXtd_Constraint)& { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 2) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeParallel: at least 2 constraintes are needed" << endl; #endif NullifyAIS(anAIS); @@ -541,7 +541,7 @@ void TPrsStd_ConstraintTools::ComputeParallel(const Handle(TDataXtd_Constraint)& } if (!aConst->IsPlanar()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeParallel: must be a planar constraint" << endl; #endif NullifyAIS(anAIS); @@ -553,7 +553,7 @@ void TPrsStd_ConstraintTools::ComputeParallel(const Handle(TDataXtd_Constraint)& GetShapesAndGeom(aConst,shape1,shape2,ageom3); if (shape1.IsNull() || shape2.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeParallel : null shape" << endl; #endif NullifyAIS(anAIS); @@ -561,7 +561,7 @@ void TPrsStd_ConstraintTools::ComputeParallel(const Handle(TDataXtd_Constraint)& } Handle(Geom_Plane) aplane = Handle(Geom_Plane)::DownCast(ageom3); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeParallel: nul plane" << endl; #endif NullifyAIS(anAIS); @@ -594,7 +594,7 @@ void TPrsStd_ConstraintTools::ComputeSymmetry(const Handle(TDataXtd_Constraint)& { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 3) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeSymmetry: at least 3 constraintes are needed" << endl; #endif NullifyAIS(anAIS); @@ -603,7 +603,7 @@ void TPrsStd_ConstraintTools::ComputeSymmetry(const Handle(TDataXtd_Constraint)& Standard_Boolean is_planar(aConst->IsPlanar()); if (!is_planar) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeSymmetry: must be a planar constraint" << endl; #endif NullifyAIS(anAIS); @@ -615,7 +615,7 @@ void TPrsStd_ConstraintTools::ComputeSymmetry(const Handle(TDataXtd_Constraint)& GetShapesAndGeom(aConst,shape1,shape2,shape3,ageom3); if (shape1.IsNull() || shape2.IsNull() || shape3.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeSymmetry : null shape" << endl; #endif NullifyAIS(anAIS); @@ -626,7 +626,7 @@ void TPrsStd_ConstraintTools::ComputeSymmetry(const Handle(TDataXtd_Constraint)& GetGoodShape(shape3); Handle(Geom_Plane) aplane = Handle(Geom_Plane)::DownCast(ageom3); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeSymmetry: null plane" << endl; #endif NullifyAIS(anAIS); @@ -660,7 +660,7 @@ void TPrsStd_ConstraintTools::ComputeMidPoint(const Handle(TDataXtd_Constraint)& Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 3) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeSymmetry: at least 3 constraints are needed" << endl; #endif NullifyAIS(anAIS); @@ -670,7 +670,7 @@ void TPrsStd_ConstraintTools::ComputeMidPoint(const Handle(TDataXtd_Constraint)& Standard_Boolean is_planar(aConst->IsPlanar()); if ( !is_planar ) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeSymmetry: must be a planar constraint" << endl; #endif NullifyAIS(anAIS); @@ -683,7 +683,7 @@ void TPrsStd_ConstraintTools::ComputeMidPoint(const Handle(TDataXtd_Constraint)& if (shape1.IsNull() || shape2.IsNull() || shape3.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeSymmetry : null shape" << endl; #endif NullifyAIS(anAIS); @@ -696,7 +696,7 @@ void TPrsStd_ConstraintTools::ComputeMidPoint(const Handle(TDataXtd_Constraint)& Handle(Geom_Plane) aplane = Handle(Geom_Plane)::DownCast(ageom3); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeSymmetry: null plane" << endl; #endif NullifyAIS(anAIS); @@ -733,14 +733,14 @@ void TPrsStd_ConstraintTools::ComputeTangent (const Handle(TDataXtd_Constraint)& { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 2) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeTangent: at leat two constraintes are needed" << endl; #endif NullifyAIS(anAIS); return; } if (!aConst->IsPlanar()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeTangent: must be a planar constraint" << endl; #endif NullifyAIS(anAIS); @@ -751,7 +751,7 @@ void TPrsStd_ConstraintTools::ComputeTangent (const Handle(TDataXtd_Constraint)& GetShapesAndGeom(aConst,shape1,shape2,ageom3); if (shape1.IsNull() || shape2.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeTangent : null shape" << endl; #endif NullifyAIS(anAIS); @@ -761,7 +761,7 @@ void TPrsStd_ConstraintTools::ComputeTangent (const Handle(TDataXtd_Constraint)& GetGoodShape(shape2); Handle(Geom_Plane) aplane = Handle(Geom_Plane)::DownCast(ageom3); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeTangent: nul plane" << endl; #endif NullifyAIS(anAIS); @@ -806,7 +806,7 @@ void TPrsStd_ConstraintTools::ComputeAngleForOneFace (const Handle(TDataXtd_Cons GetOneShape( aConst, shape ); if (shape.IsNull() ) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeAngleForOneFace : null shape" << endl; #endif NullifyAIS(anAIS); @@ -856,7 +856,7 @@ static Standard_Boolean CheckIsShapeCompound(TopoDS_Shape& shape, TopoDS_Face& a } } } -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd::Compute angle : Shape is not Compound or is Null" <NbGeometries(); if (nbgeom < 2) { if( nbgeom == 1 ) { ComputeAngleForOneFace( aConst, anAIS ); return; } -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeAngle: at least 2 constraints are needed" << endl; #endif NullifyAIS(anAIS); @@ -885,7 +885,7 @@ void TPrsStd_ConstraintTools::ComputeAngle (const Handle(TDataXtd_Constraint)& a GetShapesAndGeom (aConst,shape1,shape2,ageom3); if (shape1.IsNull() || shape2.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeAngle : null shape" << endl; #endif NullifyAIS(anAIS); @@ -909,7 +909,7 @@ void TPrsStd_ConstraintTools::ComputeAngle (const Handle(TDataXtd_Constraint)& a aFace = TopoDS::Face(shape1); else if(!CheckIsShapeCompound(shape1, aFace)) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "Compute angle : Geom type = " << shape1.ShapeType() << " non traite"<IsKind(STANDARD_TYPE(Geom_Plane))) isplan = Standard_True; else if (ageom3->IsKind(STANDARD_TYPE(Geom_Line))) isplan = Standard_False; else { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeAngle: unknown 3rd arg " << endl; #endif NullifyAIS(anAIS); @@ -1101,7 +1101,7 @@ void TPrsStd_ConstraintTools::ComputeConcentric(const Handle(TDataXtd_Constraint Standard_ProgramError::Raise ("TPrsStd_ConstraintTools::ComputeConcentric: at least 2 constraintes are needed"); } if (!aConst->IsPlanar()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeConcentric: must be a planar constraint" << endl; #endif NullifyAIS(anAIS); @@ -1112,7 +1112,7 @@ void TPrsStd_ConstraintTools::ComputeConcentric(const Handle(TDataXtd_Constraint GetShapesAndGeom(aConst,shape1,shape2,ageom3); if (shape1.IsNull() || shape2.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeConcentric : null shape" << endl; #endif NullifyAIS(anAIS); @@ -1124,7 +1124,7 @@ void TPrsStd_ConstraintTools::ComputeConcentric(const Handle(TDataXtd_Constraint //ota : to allow concentric constraint display between vertex and edge if (shape1.ShapeType() != TopAbs_EDGE && shape2.ShapeType() != TopAbs_EDGE) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeConcentric: concentric between two vertexes : NOT DISPLAYED" << endl;; #endif NullifyAIS(anAIS); @@ -1133,7 +1133,7 @@ void TPrsStd_ConstraintTools::ComputeConcentric(const Handle(TDataXtd_Constraint Handle(Geom_Plane) aplane = Handle(Geom_Plane)::DownCast(ageom3); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeConcentric: nul plane" << endl;; #endif NullifyAIS(anAIS); @@ -1168,7 +1168,7 @@ void TPrsStd_ConstraintTools::ComputeRadius (const Handle(TDataXtd_Constraint)& { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 1) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeRadius: at least one constrainte is needed" << endl; #endif NullifyAIS(anAIS); @@ -1178,7 +1178,7 @@ void TPrsStd_ConstraintTools::ComputeRadius (const Handle(TDataXtd_Constraint)& TopoDS_Shape shape1 ; GetOneShape (aConst,shape1); if (shape1.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeRadius: null shape" << endl; #endif NullifyAIS(anAIS); @@ -1190,7 +1190,7 @@ void TPrsStd_ConstraintTools::ComputeRadius (const Handle(TDataXtd_Constraint)& shape1.ShapeType()==TopAbs_COMPSOLID || shape1.ShapeType()==TopAbs_SOLID || shape1.ShapeType()==TopAbs_SHELL ) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeRadius: not good shape" << endl; #endif NullifyAIS(anAIS); @@ -1225,7 +1225,7 @@ void TPrsStd_ConstraintTools::ComputeRadius (const Handle(TDataXtd_Constraint)& GetGeom(aConst,ageom2); Handle(Geom_Plane) aplane = Handle(Geom_Plane)::DownCast(ageom2); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeRadius: nul plane" << endl; #endif NullifyAIS(anAIS); @@ -1245,7 +1245,7 @@ void TPrsStd_ConstraintTools::ComputeMinRadius (const Handle(TDataXtd_Constraint { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 1) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeMinRadius: at least one constrainte is needed" << endl; #endif NullifyAIS(anAIS); @@ -1255,7 +1255,7 @@ void TPrsStd_ConstraintTools::ComputeMinRadius (const Handle(TDataXtd_Constraint TopoDS_Shape shape1 ; GetOneShape (aConst,shape1); if (shape1.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeMinradius: null shape" << endl; #endif NullifyAIS(anAIS); @@ -1267,7 +1267,7 @@ void TPrsStd_ConstraintTools::ComputeMinRadius (const Handle(TDataXtd_Constraint shape1.ShapeType()==TopAbs_COMPSOLID || shape1.ShapeType()==TopAbs_SOLID || shape1.ShapeType()==TopAbs_SHELL ) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeMinRadius: not good shape" << endl; #endif NullifyAIS(anAIS); @@ -1304,7 +1304,7 @@ void TPrsStd_ConstraintTools::ComputeMinRadius (const Handle(TDataXtd_Constraint GetGeom(aConst,ageom2); Handle(Geom_Plane) aplane = Handle(Geom_Plane)::DownCast(ageom2); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeMinRadius: nul plane" << endl; #endif NullifyAIS(anAIS); @@ -1324,7 +1324,7 @@ void TPrsStd_ConstraintTools::ComputeMaxRadius (const Handle(TDataXtd_Constraint { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 1) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeMaxRadius: at least one constrainte is needed" << endl; #endif NullifyAIS(anAIS); @@ -1334,7 +1334,7 @@ void TPrsStd_ConstraintTools::ComputeMaxRadius (const Handle(TDataXtd_Constraint TopoDS_Shape shape1 ; GetOneShape (aConst,shape1); if (shape1.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeMaxradius: null shape" << endl; #endif NullifyAIS(anAIS); @@ -1346,7 +1346,7 @@ void TPrsStd_ConstraintTools::ComputeMaxRadius (const Handle(TDataXtd_Constraint shape1.ShapeType()==TopAbs_COMPSOLID || shape1.ShapeType()==TopAbs_SOLID || shape1.ShapeType()==TopAbs_SHELL ) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeMaxRadius: not good shape" << endl; #endif NullifyAIS(anAIS); @@ -1383,7 +1383,7 @@ void TPrsStd_ConstraintTools::ComputeMaxRadius (const Handle(TDataXtd_Constraint GetGeom(aConst,ageom2); Handle(Geom_Plane) aplane = Handle(Geom_Plane)::DownCast(ageom2); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeMaxRadius: nul plane" << endl; #endif NullifyAIS(anAIS); @@ -1403,7 +1403,9 @@ void TPrsStd_ConstraintTools::ComputeEqualDistance(const Handle(TDataXtd_Constra { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 4) { +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeEqual: at least four geometries are needed" << endl;; +#endif NullifyAIS(anAIS); return; } @@ -1412,7 +1414,7 @@ void TPrsStd_ConstraintTools::ComputeEqualDistance(const Handle(TDataXtd_Constra GetShapesAndGeom(aConst, aShape1, aShape2, aShape3, aShape4, aGeom); if (aShape1.IsNull()||aShape2.IsNull()|| aShape3.IsNull()||aShape4.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeEqualDistance : null shape" << endl; #endif NullifyAIS(anAIS); @@ -1426,7 +1428,7 @@ void TPrsStd_ConstraintTools::ComputeEqualDistance(const Handle(TDataXtd_Constra if (!CheckShapesPair(aShape1, aShape2) || !CheckShapesPair(aShape3, aShape4)){ -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeEqualDistance : at least one pair of shapes is incorrect"<NbGeometries(); if (nbgeom < 2) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeEqualRadius: at least two geometries are needed" << endl;; #endif NullifyAIS(anAIS); @@ -1565,7 +1567,7 @@ void TPrsStd_ConstraintTools::ComputeEqualRadius(const Handle(TDataXtd_Constrain GetShapesAndGeom(aConst, shape1, shape2, ageom3); if (shape1.IsNull()||shape2.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeEqualRadius : null shape" << endl; #endif NullifyAIS(anAIS); @@ -1609,7 +1611,7 @@ void TPrsStd_ConstraintTools::ComputeEqualRadius(const Handle(TDataXtd_Constrain aDir1.IsParallel(aDir2, Precision::Confusion())) aplane = aPlane2; else { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeRadiusRelation: nul plane" << endl; #endif NullifyAIS(anAIS); @@ -1646,7 +1648,7 @@ void TPrsStd_ConstraintTools::ComputeDiameter(const Handle(TDataXtd_Constraint)& { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 1) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeDiameter: at least one constrainte is needed" << endl;; #endif NullifyAIS(anAIS); @@ -1656,7 +1658,7 @@ void TPrsStd_ConstraintTools::ComputeDiameter(const Handle(TDataXtd_Constraint)& GetOneShape(aConst,shape1); if (shape1.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeDiameter : null shape" << endl; #endif NullifyAIS(anAIS); @@ -1686,7 +1688,7 @@ void TPrsStd_ConstraintTools::ComputeDiameter(const Handle(TDataXtd_Constraint)& GetGeom(aConst,ageom2); Handle(Geom_Plane) aplane = Handle(Geom_Plane)::DownCast(ageom2); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeDiameter: nul plane" << endl; #endif NullifyAIS(anAIS); @@ -1707,14 +1709,14 @@ void TPrsStd_ConstraintTools::ComputeFix(const Handle(TDataXtd_Constraint)& aCon { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 1) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeFix: at least one constrainte is needed" << endl;; #endif NullifyAIS(anAIS); return; } if (!aConst->IsPlanar()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeFix: must be a planar constraint" << endl;; #endif NullifyAIS(anAIS); @@ -1726,7 +1728,7 @@ void TPrsStd_ConstraintTools::ComputeFix(const Handle(TDataXtd_Constraint)& aCon GetOneShape(aConst,shape1); if (shape1.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeFix : null shape" << endl; #endif NullifyAIS(anAIS); @@ -1736,7 +1738,7 @@ void TPrsStd_ConstraintTools::ComputeFix(const Handle(TDataXtd_Constraint)& aCon GetGeom(aConst,ageom2); Handle(Geom_Plane) aplane = Handle(Geom_Plane)::DownCast(ageom2); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeFix: nul plane" << endl; #endif NullifyAIS(anAIS); @@ -1772,7 +1774,7 @@ void TPrsStd_ConstraintTools::ComputeOffset (const Handle(TDataXtd_Constraint)& if (is_planar) { GetGeom (aConst,aplane); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeOffset: null plane" << endl; #endif NullifyAIS(anAIS); @@ -1799,7 +1801,7 @@ void TPrsStd_ConstraintTools::ComputeOffset (const Handle(TDataXtd_Constraint)& } if (S1.IsNull() || S2.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeOffset: null shape" << endl; #endif NullifyAIS(anAIS); @@ -1944,7 +1946,7 @@ void TPrsStd_ConstraintTools::ComputeOffset (const Handle(TDataXtd_Constraint)& return; } -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeOffset: Case not implemented" << endl; #endif NullifyAIS(anAIS); @@ -1967,7 +1969,7 @@ void TPrsStd_ConstraintTools::ComputePlacement TopoDS_Shape shape1,shape2 ; GetTwoShapes(aConst,shape1,shape2); if (shape1.IsNull() || shape2.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputePlacement: nul shape" << endl; #endif NullifyAIS(anAIS); @@ -2098,7 +2100,7 @@ void TPrsStd_ConstraintTools::ComputeCoincident(const Handle(TDataXtd_Constraint { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 2) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeCoincident: at leat two constraintes are needed" << endl; #endif NullifyAIS(anAIS); @@ -2106,7 +2108,7 @@ void TPrsStd_ConstraintTools::ComputeCoincident(const Handle(TDataXtd_Constraint } if (!aConst->IsPlanar()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeCoincident: must be a planar constraint" << endl; #endif anAIS.Nullify() ; @@ -2117,7 +2119,7 @@ void TPrsStd_ConstraintTools::ComputeCoincident(const Handle(TDataXtd_Constraint Handle(Geom_Plane) aplane; GetShapesAndGeom(aConst,shape1,shape2,aplane); if (shape1.IsNull() || shape2.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeCoincident: nul shape" << endl; #endif NullifyAIS(anAIS); @@ -2127,7 +2129,7 @@ void TPrsStd_ConstraintTools::ComputeCoincident(const Handle(TDataXtd_Constraint GetGoodShape(shape1); GetGoodShape(shape2); if (aplane.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeCoincident: nul plane" << endl; #endif NullifyAIS(anAIS); @@ -2160,7 +2162,7 @@ void TPrsStd_ConstraintTools::ComputeRound(const Handle(TDataXtd_Constraint)& aC { Standard_Integer nbgeom = aConst->NbGeometries(); if (nbgeom < 1) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputeRound: at leat one geometry is needed" << endl; #endif NullifyAIS(anAIS); @@ -2169,7 +2171,7 @@ void TPrsStd_ConstraintTools::ComputeRound(const Handle(TDataXtd_Constraint)& aC TopoDS_Shape shape1; GetOneShape (aConst,shape1); if (shape1.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout << "TPrsStd_ConstraintTools::ComputePlacement: nul shape" << endl; #endif NullifyAIS(anAIS); @@ -2214,7 +2216,7 @@ void TPrsStd_ConstraintTools::GetGeom(const Handle(TDataXtd_Constraint)& aConst, { Handle(TNaming_NamedShape) atgeom = aConst->GetPlane(); if (atgeom.IsNull()) { -#ifdef DEB +#ifdef TPRSSTD_DEB cout<<"TPrsStd_ConstraintTools::GetGeom : aConst->GetPlane().IsNull()"<Shape(S,FindKeep); cout<Parameter(); Standard_Real par2; Standard_Boolean ok = FUN_tool_parE(e1,par1,e2,par2); if (!ok) { -#ifdef DEB +#ifdef TOPOPEBREP_DEB cout<<"**********TopOpeBRep FUN_shareNOG**********"< newtol) { -#ifdef DEB +#ifdef TOPOPEBREPBUILD_DEB cout<<"\npoint P"< "< purgeFon1nonoriE\n"; +#ifdef TOPOPEBREPBUILD_DEB + if (TopOpeBRepDS_GettraceSTRANGE()) + cout<<"Builder::GFABUMakeFaces -> purgeFon1nonoriE\n"; #endif continue; } diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx b/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx index a1a68f1bad..2ffb5d1301 100644 --- a/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx +++ b/src/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx @@ -714,7 +714,7 @@ void TopOpeBRepDS_BuildTool::ApproxCurves Standard_Real newtol,newparmin,newparmax; // MSV Nov 12, 2001: if approx failed than leave old curves of degree 1 if (!approxMade) { -#ifdef DEB +#ifdef TOPOPEBREPDS_DEB cout<<"TopOpeBRepDS_BuildTool::ApproxCurves : approx failed, leave curves of degree 1" <NbSurfaces() < I) { -#ifdef DEB +#ifdef TOPOPEBREPDS_DEB cout<<"Surpassed index of TopOpeBRepDS_SURFACE. actual index : "<NbSurfaces(); #endif @@ -161,7 +161,7 @@ Standard_Boolean TopOpeBRepDS_Check::CheckDS(const Standard_Integer I, case TopOpeBRepDS_CURVE : { if(myHDS->NbCurves() < I) { -#ifdef DEB +#ifdef TOPOPEBREPDS_DEB cout<<"Surpassed index of TopOpeBRepDS_CURVE. actual index : "<NbCurves(); #endif @@ -178,7 +178,7 @@ Standard_Boolean TopOpeBRepDS_Check::CheckDS(const Standard_Integer I, case TopOpeBRepDS_POINT : { if(myHDS->NbPoints() < I) { -#ifdef DEB +#ifdef TOPOPEBREPDS_DEB cout<<"Surpassed index of TopOpeBRepDS_POINT : actual index : "<NbPoints()<NbShapes() < I) { -#ifdef DEB +#ifdef TOPOPEBREPDS_DEB cout<<"Surpassed index of TopOpeBRepDS_Shape_. actual index : "<NbShapes(); #endif @@ -222,7 +222,7 @@ Standard_Boolean TopOpeBRepDS_Check::CheckDS(const Standard_Integer I, break ; } if(S.ShapeType() != se) { -#ifdef DEB +#ifdef TOPOPEBREPDS_DEB cout<<"Error : Shape "<Shape(i); const TopTools_ListOfShape& losi = BDS.ShapeSameDomain(Sind); if(!CheckShapes(losi)) { -#ifdef DEB +#ifdef TOPOPEBREPDS_DEB cout<<"Shape of ShapeSameDomain (n*n "< myNbPoints ) { -#ifdef DEB +#ifdef TOPOPEBREPDS_DEB cout<<"acces au POINT "< myNbPoints ) { -#ifdef DEB +#ifdef TOPOPEBREPDS_DEB cout<<"acces au POINT "<IsKind(STANDARD_TYPE(TopOpeBRepDS_CurvePointInterference)) ) p = Handle(TopOpeBRepDS_CurvePointInterference)::DownCast(I)->Parameter(); else { -#ifdef DEB +#ifdef TOPOPEBREPDS_DEB cout<<"EdgeInterference : mauvais type d'interference"<IsKind(STANDARD_TYPE(TopOpeBRepDS_CurvePointInterference)) ) p = Handle(TopOpeBRepDS_CurvePointInterference)::DownCast(I)->Parameter(); else { -#ifdef DEB +#ifdef TOPOPEBREPDS_DEB cout<<"EdgeInterference : mauvais type d'interference"<E,I"<Init (aOShell->Name(),aOShell->CfsFaces()); -#ifdef DEBUG +#ifdef TOPODSTOSTEP_DEB cout<<"Warning: MakeBRepWithVoids: Open shell in the solid; treated as closed"<AddWarning(errShape, " Face without wire not mapped"); @@ -277,7 +277,7 @@ void TopoDSToStep_MakeStepFace::Init(const TopoDS_Face& aFace, MkWire.Init(CurrentWire, aTool, FP); if (MkWire.IsDone()) Loop = Handle(StepShape_Loop)::DownCast(MkWire.Value()); else { -#ifdef DEBUG +#ifdef TOPODSTOSTEP_DEB cout << TopoDSToStep::DecodeWireError(MkWire.Error()) << endl; #endif FP->AddWarning(errShape, " a Wire not mapped"); diff --git a/src/TopoDSToStep/TopoDSToStep_Tool.cxx b/src/TopoDSToStep/TopoDSToStep_Tool.cxx index 3898c9be65..f71d1cbc2f 100644 --- a/src/TopoDSToStep/TopoDSToStep_Tool.cxx +++ b/src/TopoDSToStep/TopoDSToStep_Tool.cxx @@ -101,7 +101,7 @@ Standard_Boolean TopoDSToStep_Tool::Faceted() const void TopoDSToStep_Tool::SetCurrentShell(const TopoDS_Shell& S) { -#ifdef DEBUG +#ifdef TOPODSTOSTEP_DEB cout << "Process a Shell which is "; switch(S.Orientation()) { @@ -141,7 +141,7 @@ const TopoDS_Shell& TopoDSToStep_Tool::CurrentShell() const void TopoDSToStep_Tool::SetCurrentFace(const TopoDS_Face& F) { -#ifdef DEBUG +#ifdef TOPODSTOSTEP_DEB cout << " Process a Face which is "; switch(F.Orientation()) { @@ -184,7 +184,7 @@ const TopoDS_Face& TopoDSToStep_Tool::CurrentFace() const void TopoDSToStep_Tool::SetCurrentWire(const TopoDS_Wire& W) { -#ifdef DEBUG +#ifdef TOPODSTOSTEP_DEB cout << " Process a Wire which is "; switch(W.Orientation()) { @@ -224,7 +224,7 @@ const TopoDS_Wire& TopoDSToStep_Tool::CurrentWire() const void TopoDSToStep_Tool::SetCurrentEdge(const TopoDS_Edge& E) { -#ifdef DEBUG +#ifdef TOPODSTOSTEP_DEB cout << " Process Edge which is "; switch(E.Orientation()) { diff --git a/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx b/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx index 00d81089c3..74546ec1dd 100644 --- a/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx +++ b/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx @@ -160,7 +160,7 @@ Standard_Boolean TopoDSToStep_WireframeBuilder:: { if (theEdge.Orientation() == TopAbs_INTERNAL || theEdge.Orientation() == TopAbs_EXTERNAL ) { -#ifdef DEB +#ifdef TOPODSTOSTEP_DEB cout <<"Warning: TopoDSToStep_WireframeBuilder::GetTrimmedCurveFromEdge: Edge is internal or external; dropped" << endl; #endif return Standard_False; @@ -263,7 +263,7 @@ Standard_Boolean TopoDSToStep_WireframeBuilder:: Gpms = MakeTrimmedCurve (gtpL.Value(), pmsP1, pmsP2, 0, length, Standard_True ); // (anEdge.Orientation() == TopAbs_FORWARD)); } -#ifdef DEB +#ifdef TOPODSTOSTEP_DEB else cout << "Warning: TopoDSToStep_WireframeBuilder::GetTrimmedCurveFromEdge: Null-length curve not mapped" << endl; #endif } @@ -356,7 +356,7 @@ Standard_Boolean TopoDSToStep_WireframeBuilder:: for (;It.More();It.Next()) { TopoDS_Face curFace = TopoDS::Face(It.Value()); if (GetTrimmedCurveFromFace(curFace, aMap, aCurveList)) result = Standard_True; -#ifdef DEBUG +#ifdef TOPODSTOSTEP_DEB if(!result) { cout << "ERROR extracting trimmedCurve from Face" << endl; //BRepTools::Dump(curFace,cout); cout<Name() == aquantity) return quantity; } +#ifdef UNITS_DEB cout<<"Warning: BAD Quantity = Units::Quantity(quantity('" << aquantity << "'))" << endl; +#endif return nullquantity; } @@ -161,7 +163,9 @@ Standard_CString Units::FirstQuantity(const Standard_CString aunit) } } +#ifdef UNITS_DEB cout<<"Warning: BAD Quantity = Units::Quantity(unit('" << symbol << "'))" << endl; +#endif return NULL; } @@ -262,7 +266,9 @@ Standard_Real Units::ToSI(const Standard_Real aData, lastunit = TCollection_AsciiString(aUnit); Units_UnitSentence unitsentence(aUnit); if(!unitsentence.IsDone()) { +#ifdef UNITS_DEB cout<<"can not convert - incorrect unit => return 0.0"< return 0.0"<Multiplied(themeasurement); themeasurement = newtoken->Divided(themeasurement); } +#ifdef UNITS_DEB else { cout<<" The units don't have the same physical dimensions"<Clear(); -#ifdef DEB +#ifdef UNITS_DEB cout<<"Warning: can not create correct sentence from string: "<Mean()=="0" && ( PrevMean=="M" || PrevMean=="U" || PrevMean=="MU" ) ) ) { // incorrect situation thesequenceoftokens->Clear(); -#ifdef DEB +#ifdef UNITS_DEB cout<<"Warning: can not create correct sentence from string: "<Value())<1.e-40) { -#ifdef DEB +#ifdef UNITS_DEB cout<<"Warning: division on token with value=0 => return initial token."<Length()) return unitssequence->Value(1)->SymbolsSequence()->Value(1)->String(); else { +#ifdef UNITS_DEB cout<<" Pas d'unite active pour "<Value(index2)->SymbolsSequence()->Value(1)->String(); else { +#ifdef UNITS_DEB cout<<" Pas d'unite active pour "<Value(aQuantity)); aValue = Units::ToSI(aData,current.ToCString()); } +#ifdef UNITSAPI_DEB else { cout<<"Warning: UnitsAPI,the quantity '" << aQuantity << "' does not exist in the current units system" << endl; } +#endif return aValue; } @@ -224,9 +228,11 @@ Standard_Real UnitsAPI::CurrentFromLS(const Standard_Real aData, aValue = LocalSystemUnits.ConvertUserSystemValueToSI(aQuantity,aData); aValue = Units::FromSI(aValue,current.ToCString()); } +#ifdef UNITSAPI_DEB else { cout<<"Warning: UnitsAPI,the quantity '" << aQuantity << "' does not exist in the current units system" << endl; } +#endif return aValue; } @@ -246,9 +252,11 @@ Standard_Real UnitsAPI::CurrentFromSI(const Standard_Real aData, TCollection_AsciiString current(CurrentUnits->Value(aQuantity)); aValue = Units::FromSI(aData,current.ToCString()); } +#ifdef UNITSAPI_DEB else { cout<<"Warning: UnitsAPI,the quantity '" << aQuantity << "' does not exist in the current units system" << endl; } +#endif return aValue; } @@ -268,9 +276,11 @@ Standard_Real UnitsAPI::CurrentToAny(const Standard_Real aData, TCollection_AsciiString current(CurrentUnits->Value(aQuantity)); aValue = AnyToAny(aData,current.ToCString(),aUnit); } +#ifdef UNITSAPI_DEB else { cout<<"Warning: UnitsAPI,the quantity '" << aQuantity << "' does not exist in the current units system" << endl; } +#endif return aValue; } @@ -291,9 +301,11 @@ Standard_Real UnitsAPI::CurrentFromAny(const Standard_Real aData, TCollection_AsciiString current(CurrentUnits->Value(aQuantity)); aValue = AnyToAny(aData,aUnit,current.ToCString()); } +#ifdef UNITSAPI_DEB else { cout<<"Warning: UnitsAPI,the quantity '" << aQuantity << "' does not exist in the current units system" << endl; } +#endif return aValue; } @@ -317,8 +329,10 @@ Standard_Real UnitsAPI::AnyToLS(const Standard_Real aData, if( quantity ) { aValue = LocalSystemUnits.ConvertSIValueToUserSystem(quantity,aValue); } +#ifdef UNITSAPI_DEB else cout<<"Warning: BAD Quantity returns in UnitsAPI::AnyToLS(" << aData << "," << aUnit << ")" << endl; +#endif return aValue; } @@ -341,8 +355,10 @@ Standard_Real UnitsAPI::AnyToLS(const Standard_Real aData, if( quantity ) { aValue = LocalSystemUnits.ConvertSIValueToUserSystem(quantity,aValue); } +#ifdef UNITSAPI_DEB else cout<<"Warning: BAD Quantity returns in UnitsAPI::AnyToLS(" << aData << "," << aUnit << "," << aDim << ")" << endl; +#endif return aValue; } @@ -394,8 +410,10 @@ Standard_Real UnitsAPI::AnyFromLS(const Standard_Real aData, if( quantity ) { aValue = LocalSystemUnits.ConvertUserSystemValueToSI(quantity,aValue); } +#ifdef UNITSAPI_DEB else cout<<"Warning: BAD Quantity returns in UnitsAPI::AnyToLS(" << aData << "," << aUnit << ")" << endl; +#endif return aValue; } @@ -445,9 +463,11 @@ Standard_Real UnitsAPI::LSToSI(const Standard_Real aData, if( CurrentUnits->Find(aQuantity) ) { aValue = LocalSystemUnits.ConvertUserSystemValueToSI(aQuantity,aData); } +#ifdef UNITSAPI_DEB else { cout<<"Warning: UnitsAPI,the quantity '" << aQuantity << "' does not exist in the current units system" << endl; } +#endif return aValue; } @@ -466,9 +486,11 @@ Standard_Real UnitsAPI::SIToLS(const Standard_Real aData, if( CurrentUnits->Find(aQuantity) ) { aValue = LocalSystemUnits.ConvertSIValueToUserSystem(aQuantity,aValue); } +#ifdef UNITSAPI_DEB else { cout<<"Warning: UnitsAPI,the quantity '" << aQuantity << "' does not exist in the current units system" << endl; } +#endif return aValue; } diff --git a/src/UnitsMethods/UnitsMethods.cxx b/src/UnitsMethods/UnitsMethods.cxx index 0ec4b0c093..c4966d5287 100644 --- a/src/UnitsMethods/UnitsMethods.cxx +++ b/src/UnitsMethods/UnitsMethods.cxx @@ -191,13 +191,13 @@ Handle(Geom2d_Curve) UnitsMethods::RadianToDegree aCurve2d = aBSpline2d; } else if (aCurve2d->IsKind(STANDARD_TYPE(Geom2d_Parabola))) { -#ifdef DEBUG +#ifdef UNITSMETHODS_DEB cout << "PCURVE of Parabola type in U or V Periodic Surface" << endl; cout << "Parameters Not transformed to Degree" << endl; #endif } else if (aCurve2d->IsKind(STANDARD_TYPE(Geom2d_Hyperbola))) { -#ifdef DEBUG +#ifdef UNITSMETHODS_DEB cout << "PCURVE of Hyperbola type in U or V Periodic Surface" << endl; cout << "Parameters Not transformed to Degree" << endl; #endif @@ -226,7 +226,7 @@ Handle(Geom2d_Curve) UnitsMethods::RadianToDegree return myNewBSpline2d; } else { -#ifdef DEBUG +#ifdef UNITSMETHODS_DEB cout << "PCURVE of Other Types of Bounded Curve in U or V Periodic Surface" << endl; cout << "Parameters Not transformed to Degree" << endl; #endif @@ -302,14 +302,14 @@ Handle(Geom2d_Curve) UnitsMethods::DegreeToRadian aPcurve = aBSpline2d; } else if (aPcurve->IsKind(STANDARD_TYPE(Geom2d_Parabola))) { -#ifdef DEBUG +#ifdef UNITSMETHODS_DEB cout << "PCURVE of Parabola type" << endl; cout << "Parameters Not Yet transformed according to LenghtUnit" << endl; #endif return aPcurve; } else if (aPcurve->IsKind(STANDARD_TYPE(Geom2d_Hyperbola))) { -#ifdef DEBUG +#ifdef UNITSMETHODS_DEB cout << "PCURVE of Hyperbola type" << endl; cout << "Parameters Not Yet transformed according to LenghtUnit" << endl; #endif @@ -356,7 +356,7 @@ Handle(Geom2d_Curve) UnitsMethods::DegreeToRadian aPcurve = aBSpline2d; } else { -#ifdef DEBUG +#ifdef UNITSMETHODS_DEB cout << "DegreeToRadian : Type " << aPcurve->DynamicType(); cout << " not yet implemented" << endl; #endif diff --git a/src/ViewerTest/ViewerTest.cxx b/src/ViewerTest/ViewerTest.cxx index 9ef3bce06f..8093cb334a 100644 --- a/src/ViewerTest/ViewerTest.cxx +++ b/src/ViewerTest/ViewerTest.cxx @@ -4721,14 +4721,14 @@ static Standard_Boolean IsValid(const TopTools_ListOfShape& theArgs, TCollection_AsciiString checkValid = check.Value(); Standard_Boolean ToCheck = Standard_True; if (!checkValid.IsEmpty()) { -#ifdef DEB +#ifdef VIEWERTEST_DEB cout <<"DONT_SWITCH_IS_VALID positionnee a :"<Layer (MyCLayer); MyCLayer.ptrLayer->layerData = this; -#ifdef DEBUG +#ifdef VISUAL3D_DEB cout << "Visual3d_Layer::Visual3d_Layer" << endl; call_def_ptrLayer ptrLayer; ptrLayer = (call_def_ptrLayer) MyCLayer.ptrLayer; @@ -105,7 +105,7 @@ void Visual3d_Layer::End () { #ifdef TRACE_CALL cout << "Visual3d_Layer::End" << endl; #endif -#ifdef DEBUG +#ifdef VISUAL3D_DEB cout << "Visual3d_Layer::End" << endl; call_def_ptrLayer ptrLayer; ptrLayer = (call_def_ptrLayer) MyCLayer.ptrLayer; @@ -121,7 +121,7 @@ void Visual3d_Layer::End () { // Flush all graphics MyGraphicDriver->EndLayer (); theLayerState = Standard_False; -#ifdef DEBUG +#ifdef VISUAL3D_DEB cout << "Visual3d_Layer::End" << endl; ptrLayer = (call_def_ptrLayer) MyCLayer.ptrLayer; if (ptrLayer == NULL) @@ -384,7 +384,7 @@ Aspect_CLayer2d Visual3d_Layer::CLayer () const { #ifdef TRACE_CALL cout << "Visual3d_Layer::CLayer" << endl; #endif -#ifdef DEBUG +#ifdef VISUAL3D_DEB cout << "Visual3d_Layer::CLayer" << endl; call_def_ptrLayer ptrLayer; ptrLayer = (call_def_ptrLayer) MyCLayer.ptrLayer; diff --git a/src/XCAFDoc/XCAFDoc_ShapeTool.cxx b/src/XCAFDoc/XCAFDoc_ShapeTool.cxx index ea7aae8d0f..f96d65f2bf 100644 --- a/src/XCAFDoc/XCAFDoc_ShapeTool.cxx +++ b/src/XCAFDoc/XCAFDoc_ShapeTool.cxx @@ -146,7 +146,9 @@ static void SetLabelNameByLink(const TDF_Label L) Handle(TDataStd_TreeNode) Node; if (! L.FindAttribute(XCAFDoc::ShapeRefGUID(), Node) || ! Node->HasFather()) { +#ifdef XCAFDOC_DEB cout<<"Error: XCAFDoc_ShapeTool, SetLabelNameByLink(): NO NODE"<Find ( str.ToCString() ) ) { -#ifdef DEB +#ifdef XSALGO_DEB { static Standard_Integer time = 0; if ( ! time ) @@ -146,7 +146,7 @@ TopoDS_Shape XSAlgo_AlgoContainer::ProcessShape (const TopoDS_Shape& shape, } } catch (Standard_Failure) { -#ifdef DEB +#ifdef XSALGO_DEB cout << "Error: XSAlgo_AlgoContainer::ProcessShape(): Exception in ShapeFix::Shape" << endl; Standard_Failure::Caught()->Print(cout); cout << endl; #endif @@ -298,7 +298,7 @@ Standard_Boolean XSAlgo_AlgoContainer::CheckPCurve (const TopoDS_Edge& E, Standard_Real DV = Abs (PUV1.Y() - PUV2.Y()); if ( DU/8. > (UL/6. - UF/6.) || DV/8. > (VL/6. - VF/6.) ) { ShapeBuild_Edge().RemovePCurve(E,face); -#ifdef DEBUG +#ifdef XSALGO_DEB cout<<"Removing pcuve periodic"<NbTransients() > 1 ) { resBinder->AddResult(TransientListBinder); // resBinder->SetNext(TransientListBinder, Standard_True); -#ifdef DEB +#ifdef XSALGO_DEB cout<<"Info: TransientListBinder created for splitted shape"< Paste (tAtt, pAtt, theRelocTable); } -#ifdef DEB +#ifdef XMLMDF_DEB else if (!UnsuppTypesMap().Contains (aType)) { cout << "attribute driver for type "<< aType -> Name()<< " not found"<< endl; @@ -260,7 +260,7 @@ Standard_Integer XmlMDF::ReadSubTree (const XmlObjMgt_Element& theElement, else if (isBound == Standard_False) theRelocTable.Bind (anID, tAtt); } -#ifdef DEB +#ifdef XMLMDATASTD_DEB else { const TCollection_AsciiString anAsciiName = aName; diff --git a/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx index 91721cc19e..745d2a9bfe 100644 --- a/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx @@ -109,9 +109,6 @@ Standard_Boolean XmlMDataStd_ByteArrayDriver::Paste(const XmlObjMgt_Persistent& } aByteArray->ChangeArray(hArr); -#ifdef DEB - //cout << "CurDocVersion = " << XmlMDataStd::DocumentVersion() < 2) { @@ -128,7 +125,7 @@ Standard_Boolean XmlMDataStd_ByteArrayDriver::Paste(const XmlObjMgt_Persistent& else aDelta = (Standard_Boolean)aDeltaValue; } -#ifdef DEB +#ifdef XMLMDATASTD_DEB else if(XmlMDataStd::DocumentVersion() == -1) cout << "Current DocVersion field is not initialized. " <SetValue( aLastInd, aValueStr ); -#ifdef DEB - //cout << "CurDocVersion = " << XmlMDataStd::DocumentVersion() < 2) { @@ -126,7 +123,7 @@ Standard_Boolean XmlMDataStd_ExtStringArrayDriver::Paste else aDelta = (Standard_Boolean)aDeltaValue; } -#ifdef DEB +#ifdef XMLMDATASTD_DEB else if(XmlMDataStd::DocumentVersion() == -1) cout << "Current DocVersion field is not initialized. " <ChangeMap(aHMap)) Ok = Standard_True; } - // -#ifdef DEB - //cout << "CurDocVersion = " << XmlMDataStd::DocumentVersion() <SetValue(ind, aValue); } } -#ifdef DEB - //cout << "CurDocVersion = " << XmlMDataStd::DocumentVersion() < 2) { @@ -131,7 +128,7 @@ Standard_Boolean XmlMDataStd_IntegerArrayDriver::Paste else aDelta = (Standard_Boolean)aDeltaValue; } -#ifdef DEB +#ifdef XMLMDATASTD_DEB else if(XmlMDataStd::DocumentVersion() == -1) cout << "Current DocVersion field is not initialized. " <getAttribute(::Value()); -// const char* aS = aValStr.GetString(); -// cout << " Key = " << TCollection_AsciiString(aKey, '?') << " aValue = " << aS << endl; -#endif - TCollection_AsciiString aValueString = aCurElement->getAttribute(::Value()); Handle(TColStd_HArray1OfInteger) aValue = BuildIntArray(aValueString, aLen); if(aValue.IsNull()) { @@ -519,11 +513,6 @@ Standard_Boolean XmlMDataStd_NamedDataDriver::Paste(const XmlObjMgt_Persistent& } TCollection_AsciiString aVal(aValueStr,'?'); Standard_Integer aLen = aVal.IntegerValue(); -#ifdef DEB -// XmlObjMgt_DOMString aValStr = aCurElement->getAttribute(::Value()); -// const char* aS = aValStr.GetString(); -// cout << " Key = " << TCollection_AsciiString(aKey, '?') << " aValue = " <getAttribute(::Value()); Handle(TColStd_HArray1OfInteger) aValue = BuildIntArray(aValueString, aLen); if(aValue.IsNull()) { diff --git a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx index 7465afa297..2304bee8bd 100644 --- a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx @@ -118,9 +118,6 @@ Standard_Boolean XmlMDataStd_RealArrayDriver::Paste aRealArray->SetValue(ind, aValue); } } -#ifdef DEB - //cout << "CurDocVersion = " << XmlMDataStd::DocumentVersion() < 2) { @@ -137,7 +134,7 @@ Standard_Boolean XmlMDataStd_RealArrayDriver::Paste else aDelta = (Standard_Boolean)aDeltaValue; } -#ifdef DEB +#ifdef XMLMDATASTD_DEB else if(XmlMDataStd::DocumentVersion() == -1) cout << "Current DocVersion field is not initialized. " < ${MaxTol}} { - puts "Error: Tolerance is too big!" -} - -#Theoretically, c2d1_1 must cover V-diapason of surface s1 fully. - -set log [dump c2d1_1] - -regexp {Degree +([-0-9.+eE]+), +([-0-9.+eE]+) Poles, +([-0-9.+eE]+)} ${log} full Degree Poles KnotsPoles -puts "Degree=${Degree}" -puts "Poles=${Poles}" -puts "KnotsPoles=${KnotsPoles}" -puts "" - -set Pole 1 -set exp_string " +${Pole} : +(\[-0-9.+eE\]+), +(\[-0-9.+eE\]+)" -regexp ${exp_string} ${log} full U_begin V_begin - -puts "Pole=${Pole}" -puts "U_begin=${U_begin}" -puts "V_begin=${V_begin}" -dset V_begin ${V_begin} -puts "" - -set Pole ${Poles} -set exp_string " +${Pole} : +(\[-0-9.+eE\]+), +(\[-0-9.+eE\]+)" -regexp ${exp_string} ${log} full U_end V_end - -puts "Pole=${Pole}" -puts "U_end=${U_end}" -puts "V_end=${V_end}" -dset V_end ${V_end} -puts "" - -set delta_f [dval V1l_exp-V_begin] - -#ATTENTION!!! V_begin must be strictly equal V1l_exp (without any tolerance) -if {${delta_f} != 0} { - puts "Error: Bad value. V_begin = [dval V_begin], Vlast = [dval V1l_exp]." -} else { - puts "OK: Good value. V_begin matches with Vlast of surface." -} - -puts "" - -set delta_l [dval V1f_exp-V_end] - -#ATTENTION!!! V_end must be strictly equal V1f_exp (without any tolerance) -if {${delta_l} != 0} { - puts "Error: Bad value. V_end = [dval V_end], Vfirst = [dval V1f_exp]." -} else { - puts "OK: Good value. V_end matches with Vfirst of surface." -} +puts "=========" +puts "OCC24612" +puts "=========" +puts "" +########################################################### +# Wrong pcurve of the section curve +########################################################### + +set MaxTol 5.0e-7 +set NbCurv_OK 1 +restore [locate_data_file bug24612_b1.brep] b1 +restore [locate_data_file bug24612_b2.brep] b2 + +mksurface s1 b1 +bounds s1 U1f_exp U1l_exp V1f_exp V1l_exp + +dval U1f_exp +dval U1l_exp +dval V1f_exp +dval V1l_exp + +set log [bopcurves b1 b2 -2d] + +regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} ${log} full Toler NbCurv + +if {${NbCurv} != ${NbCurv_OK}} { + puts "Error: ${NbCurv_OK} curve(s) expected, but ${NbCurv} found." +} + +if {${Toler} > ${MaxTol}} { + puts "Error: Tolerance is too big!" +} + +#Theoretically, c2d1_1 must cover V-diapason of surface s1 fully. + +set log [dump c2d1_1] + +regexp {Degree +([-0-9.+eE]+), +([-0-9.+eE]+) Poles, +([-0-9.+eE]+)} ${log} full Degree Poles KnotsPoles +puts "Degree=${Degree}" +puts "Poles=${Poles}" +puts "KnotsPoles=${KnotsPoles}" +puts "" + +set Pole 1 +set exp_string " +${Pole} : +(\[-0-9.+eE\]+), +(\[-0-9.+eE\]+)" +regexp ${exp_string} ${log} full U_begin V_begin + +puts "Pole=${Pole}" +puts "U_begin=${U_begin}" +puts "V_begin=${V_begin}" +dset V_begin ${V_begin} +puts "" + +set Pole ${Poles} +set exp_string " +${Pole} : +(\[-0-9.+eE\]+), +(\[-0-9.+eE\]+)" +regexp ${exp_string} ${log} full U_end V_end + +puts "Pole=${Pole}" +puts "U_end=${U_end}" +puts "V_end=${V_end}" +dset V_end ${V_end} +puts "" + +set delta_f [dval V1l_exp-V_begin] + +#ATTENTION!!! V_begin must be strictly equal V1l_exp (without any tolerance) +if {${delta_f} != 0} { + puts "Error: Bad value. V_begin = [dval V_begin], Vlast = [dval V1l_exp]." +} else { + puts "OK: Good value. V_begin matches with Vlast of surface." +} + +puts "" + +set delta_l [dval V1f_exp-V_end] + +#ATTENTION!!! V_end must be strictly equal V1f_exp (without any tolerance) +if {${delta_l} != 0} { + puts "Error: Bad value. V_end = [dval V_end], Vfirst = [dval V1f_exp]." +} else { + puts "OK: Good value. V_end matches with Vfirst of surface." +} diff --git a/tests/bugs/vis/bug137_4 b/tests/bugs/vis/bug137_4 index fa72e3258c..ecc2e8c2ec 100755 --- a/tests/bugs/vis/bug137_4 +++ b/tests/bugs/vis/bug137_4 @@ -1,53 +1,53 @@ - -puts "========================" -puts "OCC137" -puts "========================" -############################################################### -#Patch description: -# -#MIT010717 : 3D selection management -#>>> MIT010717 : Selection management -# -# * Package OpenGl (OpenGl_execstruct.c) -# -# @ Avoid drawing quality problem on selected face, -# enable/disable Z offset on highlighted faces. -# -#>>> MIT010717 : drawing management -# -# * Package OpenGl (OpenGl_indexpolygon.c, ...) -# -# @ Avoid to undraw faces with confused points -############################################################### -puts "========================" - -vinit -box b 10 10 10 -vdisplay b -vfit -vsetdispmode 1 - -puts "Only bottom face should be highlighted." - -vselmode 4 1 - -OCC137 1 -OCC137_z - -set x_coord 105 -set y_coord 348 - -vmoveto $x_coord $y_coord - -set x_coord 105 -set y_coord 340 - -checkcolor $x_coord $y_coord 0 1 1 - -set x_coord 105 -set y_coord 340 -vviewparams -scale 60.6309 -proj 0.592163 -0.60038 -0.537482 -up 0.369921 -0.390032 0.843228 -at 3.29057034725635 6.73314999296002 6.55157729015654 - -checkcolor $x_coord $y_coord 0.78 0.54 0.09 - -set only_screen 1 + +puts "========================" +puts "OCC137" +puts "========================" +############################################################### +#Patch description: +# +#MIT010717 : 3D selection management +#>>> MIT010717 : Selection management +# +# * Package OpenGl (OpenGl_execstruct.c) +# +# @ Avoid drawing quality problem on selected face, +# enable/disable Z offset on highlighted faces. +# +#>>> MIT010717 : drawing management +# +# * Package OpenGl (OpenGl_indexpolygon.c, ...) +# +# @ Avoid to undraw faces with confused points +############################################################### +puts "========================" + +vinit +box b 10 10 10 +vdisplay b +vfit +vsetdispmode 1 + +puts "Only bottom face should be highlighted." + +vselmode 4 1 + +OCC137 1 +OCC137_z + +set x_coord 105 +set y_coord 348 + +vmoveto $x_coord $y_coord + +set x_coord 105 +set y_coord 340 + +checkcolor $x_coord $y_coord 0 1 1 + +set x_coord 105 +set y_coord 340 +vviewparams -scale 60.6309 -proj 0.592163 -0.60038 -0.537482 -up 0.369921 -0.390032 0.843228 -at 3.29057034725635 6.73314999296002 6.55157729015654 + +checkcolor $x_coord $y_coord 0.78 0.54 0.09 + +set only_screen 1 diff --git a/tests/bugs/vis/bug137_5 b/tests/bugs/vis/bug137_5 index feff6df430..0c9367dfcd 100755 --- a/tests/bugs/vis/bug137_5 +++ b/tests/bugs/vis/bug137_5 @@ -1,53 +1,53 @@ - -puts "========================" -puts "OCC137" -puts "========================" -############################################################### -#Patch description: -# -#MIT010717 : 3D selection management -#>>> MIT010717 : Selection management -# -# * Package OpenGl (OpenGl_execstruct.c) -# -# @ Avoid drawing quality problem on selected face, -# enable/disable Z offset on highlighted faces. -# -#>>> MIT010717 : drawing management -# -# * Package OpenGl (OpenGl_indexpolygon.c, ...) -# -# @ Avoid to undraw faces with confused points -############################################################### -puts "========================" - -vinit -box b 10 10 10 -vdisplay b -vfit -vsetdispmode 1 - -puts "Only bottom face should be highlighted." - -OCC137 1 -OCC137_z - -vselmode 4 1 - -set x_coord 105 -set y_coord 348 - -vmoveto $x_coord $y_coord - -set x_coord 105 -set y_coord 340 - -checkcolor $x_coord $y_coord 0 1 1 - -vviewparams -scale 60.6309 -proj 0.592163 -0.60038 -0.537482 -up 0.369921 -0.390032 0.843228 -at 3.29057034725635 6.73314999296002 6.55157729015654 -set x_coord 105 -set y_coord 340 - -checkcolor $x_coord $y_coord 0.78 0.54 0.09 - -set only_screen 1 + +puts "========================" +puts "OCC137" +puts "========================" +############################################################### +#Patch description: +# +#MIT010717 : 3D selection management +#>>> MIT010717 : Selection management +# +# * Package OpenGl (OpenGl_execstruct.c) +# +# @ Avoid drawing quality problem on selected face, +# enable/disable Z offset on highlighted faces. +# +#>>> MIT010717 : drawing management +# +# * Package OpenGl (OpenGl_indexpolygon.c, ...) +# +# @ Avoid to undraw faces with confused points +############################################################### +puts "========================" + +vinit +box b 10 10 10 +vdisplay b +vfit +vsetdispmode 1 + +puts "Only bottom face should be highlighted." + +OCC137 1 +OCC137_z + +vselmode 4 1 + +set x_coord 105 +set y_coord 348 + +vmoveto $x_coord $y_coord + +set x_coord 105 +set y_coord 340 + +checkcolor $x_coord $y_coord 0 1 1 + +vviewparams -scale 60.6309 -proj 0.592163 -0.60038 -0.537482 -up 0.369921 -0.390032 0.843228 -at 3.29057034725635 6.73314999296002 6.55157729015654 +set x_coord 105 +set y_coord 340 + +checkcolor $x_coord $y_coord 0.78 0.54 0.09 + +set only_screen 1 diff --git a/tests/bugs/vis/bug24901 b/tests/bugs/vis/bug24901 index 721eb8da2d..215e0b2f73 100755 --- a/tests/bugs/vis/bug24901 +++ b/tests/bugs/vis/bug24901 @@ -1,28 +1,28 @@ -puts "============" -puts "CR24901" -puts "============" -puts "" -####################################################################### -# Visualization - Incorrect area filled with capping color -####################################################################### - -vinit View1 -box b 10 10 10 -vdisplay b -vsetdispmode 1 - -vclipplane create pln1 -vclipplane set pln1 object b -vclipplane change pln1 equation 0 1 0 -5 -vclipplane change pln1 capping on -vfit -vmoveto 304 146 - -set x_coord 304 -set y_coord 146 -checkcolor $x_coord $y_coord 0 1 1 -if { $stat != 1 } { - puts "Error : Highlighting is broken." -} - -set only_screen 1 +puts "============" +puts "CR24901" +puts "============" +puts "" +####################################################################### +# Visualization - Incorrect area filled with capping color +####################################################################### + +vinit View1 +box b 10 10 10 +vdisplay b +vsetdispmode 1 + +vclipplane create pln1 +vclipplane set pln1 object b +vclipplane change pln1 equation 0 1 0 -5 +vclipplane change pln1 capping on +vfit +vmoveto 304 146 + +set x_coord 304 +set y_coord 146 +checkcolor $x_coord $y_coord 0 1 1 +if { $stat != 1 } { + puts "Error : Highlighting is broken." +} + +set only_screen 1 diff --git a/tests/bugs/vis/bug25229 b/tests/bugs/vis/bug25229 index 4a8390413e..0ba2cc4228 100644 --- a/tests/bugs/vis/bug25229 +++ b/tests/bugs/vis/bug25229 @@ -4,16 +4,16 @@ puts "============" puts "" ####################################################################### # Cappings have gray tint if setting color with vclipplane command. -####################################################################### -box b 100 100 100 -vinit -vsetdispmode 1 -vdisplay b -vclipplane create pln1 -vclipplane change pln1 equation 0 0 -1 20 -vclipplane set pln1 object b -vclipplane change pln1 capping on -vclipplane change pln1 capping color 1.0 1.0 1.0 +####################################################################### +box b 100 100 100 +vinit +vsetdispmode 1 +vdisplay b +vclipplane create pln1 +vclipplane change pln1 equation 0 0 -1 20 +vclipplane set pln1 object b +vclipplane change pln1 capping on +vclipplane change pln1 capping color 1.0 1.0 1.0 vtop vfit -- 2.20.1