Thread: [brlcad-commits] SF.net SVN: brlcad:[34406] brlcad/trunk/src/conv/step
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2009-05-01 21:48:57
|
Revision: 34406 http://brlcad.svn.sourceforge.net/brlcad/?rev=34406&view=rev Author: brlcad Date: 2009-05-01 21:48:51 +0000 (Fri, 01 May 2009) Log Message: ----------- this should at least restore the build to a working state for now. make it an EXTRA_PROGRAMS so we can traverse into here even though the fedex stuff isn't being generated. (STEP_FEDEX_PLUS, STEP, and STEP_AP203 are not subst'd) few other minor changes are keeping 'sources' and headers declared separately for consistency. Modified Paths: -------------- brlcad/trunk/src/conv/step/Makefile.am Added Paths: ----------- brlcad/trunk/src/conv/step/needFunc.cc brlcad/trunk/src/conv/step/needFunc.h Modified: brlcad/trunk/src/conv/step/Makefile.am =================================================================== --- brlcad/trunk/src/conv/step/Makefile.am 2009-05-01 21:44:39 UTC (rev 34405) +++ brlcad/trunk/src/conv/step/Makefile.am 2009-05-01 21:48:51 UTC (rev 34406) @@ -1,6 +1,13 @@ -bin_PROGRAMS = step-g +EXTRA_PROGRAMS = step-g -fedex_headers = \ +step_g_SOURCES = \ + AdvancedBrepShapeRepresentation.cpp \ + BRLCADWrapper.cpp \ + STEPWrapper.cpp \ + needFunc.cc \ + step-g.cpp + +fedex_hdrs = \ SdaiCONFIG_CONTROL_DESIGN.h \ Sdaiclasses.h \ schema.h @@ -12,54 +19,42 @@ compstructs.cc \ schema.cc -# $(fedex_srcs) - +# $(fedex_hdrs) noinst_HEADERS = \ - $(fedex_headers) \ AdvancedBrepShapeRepresentation.h \ BRLCADWrapper.h \ - STEPWrapper.h + STEPWrapper.h \ + needFunc.h -step_g_SOURCES = \ - ${top_srcdir}/src/other/step/src/test/needFunc.cc \ - AdvancedBrepShapeRepresentation.cpp \ - BRLCADWrapper.cpp \ - STEPWrapper.cpp \ - step-g.cpp - # per-program CPPFLAGS wasn't added until automake 1.7 step_g_CFLAGS = \ + ${OPENNURBS_CPPFLAGS} \ ${STEP_CPPFLAGS} \ - ${TCL_CPPFLAGS} \ - ${OPENNURBS_CPPFLAGS} + ${TCL_CPPFLAGS} -BUILT_SOURCES = \ - $(fedex_srcs) \ - $(fedex_headers) +#BUILT_SOURCES = \ +# $(fedex_srcs) \ +# $(fedex_headers) -step_g_DEPENDENCIES = \ - $(STEP_LIBS) \ - $(STEP_FEDEX_PLUS) \ - $(STEP_AP203) - step_g_LDADD = \ ${BU} \ ${WDB} \ ${RT} \ - ${STEP_LIBS} + ${STEP} -$(STEP_FEDEX_PLUS): - -$(fedex_sources): $(STEP_FEDEX_PLUS) - echo "Building fedex_sources: ${fedex_sources}" +$(fedex_srcs): + echo "Building fedex sources: ${fedex_srcs} ${fedex_hdrs}" $(STEP_FEDEX_PLUS) $(STEP_AP203) -$(step_g_OBJECTS): $(fedex_sources) +$(fedex_hdrs): ${fedex_srcs} + +# $(step_g_OBJECTS): $(fedex_srcs) + +CLEANFILES = $(fedex_srcs) + include $(top_srcdir)/misc/Makefile.defs FAST_OBJECTS = \ $(step_g_OBJECTS) \ $(bin_PROGRAMS) - -CLEANFILES=$(fedex_sources) Copied: brlcad/trunk/src/conv/step/needFunc.cc (from rev 34394, brlcad/trunk/src/other/step/src/test/needFunc.cc) =================================================================== --- brlcad/trunk/src/conv/step/needFunc.cc (rev 0) +++ brlcad/trunk/src/conv/step/needFunc.cc 2009-05-01 21:48:51 UTC (rev 34406) @@ -0,0 +1,20 @@ +#include <needFunc.h> + +/////////////////////////////////////////////////////////////////////////////// +// Function defined as a stub (necessary to use the scl) +// The purpose of this function is to allow the DisplayNode object to delete +// an object that it knows nothing about. It was made generic so that the scl +// could be used with any display toolkit. +// +// This function is called by the DisplayNode object +// This function needs to be defined outside the SCL libraries. It needs to do +// two things: +// 1) unmap the StepEntityEditor window if it is mapped. +// 2) delete the StepEntityEditor window +// To see an example of this function used with the Data Probe look in +// ../clprobe-ui/StepEntEditor.cc Look at DeleteSEE() and ~StepEntityEditor(). +/////////////////////////////////////////////////////////////////////////////// +void DeleteSEE(StepEntityEditor *se) +{ + delete se; +} Copied: brlcad/trunk/src/conv/step/needFunc.h (from rev 34394, brlcad/trunk/src/other/step/src/test/needFunc.h) =================================================================== --- brlcad/trunk/src/conv/step/needFunc.h (rev 0) +++ brlcad/trunk/src/conv/step/needFunc.h 2009-05-01 21:48:51 UTC (rev 34406) @@ -0,0 +1,15 @@ +#ifdef __O3DB__ +#include <OpenOODB.h> +#endif + +// define this to be the name of the display window object for +// STEP entity instance editing or define your own. + +class StepEntityEditor +{ + public: + StepEntityEditor() {}; + ~StepEntityEditor() {}; +}; + +extern void DeleteSEE(StepEntityEditor *se); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-06-01 07:33:53
|
Revision: 34620 http://brlcad.svn.sourceforge.net/brlcad/?rev=34620&view=rev Author: brlcad Date: 2009-06-01 07:32:38 +0000 (Mon, 01 Jun 2009) Log Message: ----------- shoved the stub function into libcleditor so it should no longer be an unresolved symbol just by using the library. Modified Paths: -------------- brlcad/trunk/src/conv/step/Makefile.am Removed Paths: ------------- brlcad/trunk/src/conv/step/needFunc.cc brlcad/trunk/src/conv/step/needFunc.h Modified: brlcad/trunk/src/conv/step/Makefile.am =================================================================== --- brlcad/trunk/src/conv/step/Makefile.am 2009-06-01 07:30:06 UTC (rev 34619) +++ brlcad/trunk/src/conv/step/Makefile.am 2009-06-01 07:32:38 UTC (rev 34620) @@ -9,7 +9,6 @@ AdvancedBrepShapeRepresentation.cpp \ BRLCADWrapper.cpp \ STEPWrapper.cpp \ - needFunc.cc \ step-g.cpp fedex_hdrs = \ @@ -31,8 +30,7 @@ noinst_HEADERS = \ AdvancedBrepShapeRepresentation.h \ BRLCADWrapper.h \ - STEPWrapper.h \ - needFunc.h + STEPWrapper.h # per-program CPPFLAGS wasn't added until automake 1.7 step_g_CXXFLAGS = \ Deleted: brlcad/trunk/src/conv/step/needFunc.cc =================================================================== --- brlcad/trunk/src/conv/step/needFunc.cc 2009-06-01 07:30:06 UTC (rev 34619) +++ brlcad/trunk/src/conv/step/needFunc.cc 2009-06-01 07:32:38 UTC (rev 34620) @@ -1,20 +0,0 @@ -#include <needFunc.h> - -/////////////////////////////////////////////////////////////////////////////// -// Function defined as a stub (necessary to use the scl) -// The purpose of this function is to allow the DisplayNode object to delete -// an object that it knows nothing about. It was made generic so that the scl -// could be used with any display toolkit. -// -// This function is called by the DisplayNode object -// This function needs to be defined outside the SCL libraries. It needs to do -// two things: -// 1) unmap the StepEntityEditor window if it is mapped. -// 2) delete the StepEntityEditor window -// To see an example of this function used with the Data Probe look in -// ../clprobe-ui/StepEntEditor.cc Look at DeleteSEE() and ~StepEntityEditor(). -/////////////////////////////////////////////////////////////////////////////// -void DeleteSEE(StepEntityEditor *se) -{ - delete se; -} Deleted: brlcad/trunk/src/conv/step/needFunc.h =================================================================== --- brlcad/trunk/src/conv/step/needFunc.h 2009-06-01 07:30:06 UTC (rev 34619) +++ brlcad/trunk/src/conv/step/needFunc.h 2009-06-01 07:32:38 UTC (rev 34620) @@ -1,15 +0,0 @@ -#ifdef __O3DB__ -#include <OpenOODB.h> -#endif - -// define this to be the name of the display window object for -// STEP entity instance editing or define your own. - -class StepEntityEditor -{ - public: - StepEntityEditor() {}; - ~StepEntityEditor() {}; -}; - -extern void DeleteSEE(StepEntityEditor *se); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2009-10-30 15:13:09
|
Revision: 36357 http://brlcad.svn.sourceforge.net/brlcad/?rev=36357&view=rev Author: starseeker Date: 2009-10-30 15:12:51 +0000 (Fri, 30 Oct 2009) Log Message: ----------- Add footers to all step conv files that don't appear to be static copies of NIST files - need to discuss what has to happen with the NIST code with indianlarry in order to use the step libs in src/otheer/step Modified Paths: -------------- brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h brlcad/trunk/src/conv/step/AdvancedFace.cpp brlcad/trunk/src/conv/step/AdvancedFace.h brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.cpp brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.h brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.cpp brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.h brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.cpp brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.h brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.cpp brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.h brlcad/trunk/src/conv/step/AreaContextDependentUnit.cpp brlcad/trunk/src/conv/step/AreaContextDependentUnit.h brlcad/trunk/src/conv/step/AreaConversionBasedUnit.cpp brlcad/trunk/src/conv/step/AreaConversionBasedUnit.h brlcad/trunk/src/conv/step/AreaSiUnit.cpp brlcad/trunk/src/conv/step/AreaSiUnit.h brlcad/trunk/src/conv/step/AreaUnit.cpp brlcad/trunk/src/conv/step/AreaUnit.h brlcad/trunk/src/conv/step/Axis1Placement.cpp brlcad/trunk/src/conv/step/Axis1Placement.h brlcad/trunk/src/conv/step/Axis2Placement.cpp brlcad/trunk/src/conv/step/Axis2Placement.h brlcad/trunk/src/conv/step/Axis2Placement2D.cpp brlcad/trunk/src/conv/step/Axis2Placement2D.h brlcad/trunk/src/conv/step/Axis2Placement3D.cpp brlcad/trunk/src/conv/step/Axis2Placement3D.h brlcad/trunk/src/conv/step/BRLCADWrapper.cpp brlcad/trunk/src/conv/step/BRLCADWrapper.h brlcad/trunk/src/conv/step/BSplineCurve.cpp brlcad/trunk/src/conv/step/BSplineCurve.h brlcad/trunk/src/conv/step/BSplineCurveWithKnots.cpp brlcad/trunk/src/conv/step/BSplineCurveWithKnots.h brlcad/trunk/src/conv/step/BSplineSurface.cpp brlcad/trunk/src/conv/step/BSplineSurface.h brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.cpp brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.h brlcad/trunk/src/conv/step/BezierCurve.cpp brlcad/trunk/src/conv/step/BezierCurve.h brlcad/trunk/src/conv/step/BezierSurface.cpp brlcad/trunk/src/conv/step/BezierSurface.h brlcad/trunk/src/conv/step/BoundaryCurve.cpp brlcad/trunk/src/conv/step/BoundaryCurve.h brlcad/trunk/src/conv/step/BoundedCurve.cpp brlcad/trunk/src/conv/step/BoundedCurve.h brlcad/trunk/src/conv/step/BoundedPCurve.cpp brlcad/trunk/src/conv/step/BoundedPCurve.h brlcad/trunk/src/conv/step/BoundedSurface.cpp brlcad/trunk/src/conv/step/BoundedSurface.h brlcad/trunk/src/conv/step/BoundedSurfaceCurve.cpp brlcad/trunk/src/conv/step/BoundedSurfaceCurve.h brlcad/trunk/src/conv/step/CartesianPoint.cpp brlcad/trunk/src/conv/step/CartesianPoint.h brlcad/trunk/src/conv/step/CartesianTransformationOperator.cpp brlcad/trunk/src/conv/step/CartesianTransformationOperator.h brlcad/trunk/src/conv/step/CartesianTransformationOperator2D.cpp brlcad/trunk/src/conv/step/CartesianTransformationOperator2D.h brlcad/trunk/src/conv/step/CartesianTransformationOperator3D.cpp brlcad/trunk/src/conv/step/CartesianTransformationOperator3D.h brlcad/trunk/src/conv/step/Circle.cpp brlcad/trunk/src/conv/step/Circle.h brlcad/trunk/src/conv/step/ClosedShell.cpp brlcad/trunk/src/conv/step/ClosedShell.h brlcad/trunk/src/conv/step/CompositeCurve.cpp brlcad/trunk/src/conv/step/CompositeCurve.h brlcad/trunk/src/conv/step/CompositeCurveOnSurface.cpp brlcad/trunk/src/conv/step/CompositeCurveOnSurface.h brlcad/trunk/src/conv/step/CompositeCurveSegment.cpp brlcad/trunk/src/conv/step/CompositeCurveSegment.h brlcad/trunk/src/conv/step/Conic.cpp brlcad/trunk/src/conv/step/Conic.h brlcad/trunk/src/conv/step/ConicalSurface.cpp brlcad/trunk/src/conv/step/ConicalSurface.h brlcad/trunk/src/conv/step/ConnectedFaceSet.cpp brlcad/trunk/src/conv/step/ConnectedFaceSet.h brlcad/trunk/src/conv/step/ContextDependentUnit.cpp brlcad/trunk/src/conv/step/ContextDependentUnit.h brlcad/trunk/src/conv/step/ConversionBasedUnit.cpp brlcad/trunk/src/conv/step/ConversionBasedUnit.h brlcad/trunk/src/conv/step/Curve.cpp brlcad/trunk/src/conv/step/Curve.h brlcad/trunk/src/conv/step/CurveBoundedSurface.cpp brlcad/trunk/src/conv/step/CurveBoundedSurface.h brlcad/trunk/src/conv/step/CurveReplica.cpp brlcad/trunk/src/conv/step/CurveReplica.h brlcad/trunk/src/conv/step/CylindricalSurface.cpp brlcad/trunk/src/conv/step/CylindricalSurface.h brlcad/trunk/src/conv/step/DefinitionalRepresentation.cpp brlcad/trunk/src/conv/step/DefinitionalRepresentation.h brlcad/trunk/src/conv/step/DerivedUnit.cpp brlcad/trunk/src/conv/step/DerivedUnit.h brlcad/trunk/src/conv/step/DerivedUnitElement.cpp brlcad/trunk/src/conv/step/DerivedUnitElement.h brlcad/trunk/src/conv/step/DimensionalExponents.cpp brlcad/trunk/src/conv/step/DimensionalExponents.h brlcad/trunk/src/conv/step/Direction.cpp brlcad/trunk/src/conv/step/Direction.h brlcad/trunk/src/conv/step/Edge.cpp brlcad/trunk/src/conv/step/Edge.h brlcad/trunk/src/conv/step/EdgeCurve.cpp brlcad/trunk/src/conv/step/EdgeCurve.h brlcad/trunk/src/conv/step/EdgeLoop.cpp brlcad/trunk/src/conv/step/EdgeLoop.h brlcad/trunk/src/conv/step/ElectricCurrentContextDependentUnit.cpp brlcad/trunk/src/conv/step/ElectricCurrentContextDependentUnit.h brlcad/trunk/src/conv/step/ElectricCurrentConversionBasedUnit.cpp brlcad/trunk/src/conv/step/ElectricCurrentConversionBasedUnit.h brlcad/trunk/src/conv/step/ElectricCurrentSiUnit.cpp brlcad/trunk/src/conv/step/ElectricCurrentSiUnit.h brlcad/trunk/src/conv/step/ElectricCurrentUnit.cpp brlcad/trunk/src/conv/step/ElectricCurrentUnit.h brlcad/trunk/src/conv/step/ElementarySurface.cpp brlcad/trunk/src/conv/step/ElementarySurface.h brlcad/trunk/src/conv/step/Ellipse.cpp brlcad/trunk/src/conv/step/Ellipse.h brlcad/trunk/src/conv/step/Face.cpp brlcad/trunk/src/conv/step/Face.h brlcad/trunk/src/conv/step/FaceBound.cpp brlcad/trunk/src/conv/step/FaceBound.h brlcad/trunk/src/conv/step/FaceOuterBound.cpp brlcad/trunk/src/conv/step/FaceOuterBound.h brlcad/trunk/src/conv/step/FaceSurface.cpp brlcad/trunk/src/conv/step/FaceSurface.h brlcad/trunk/src/conv/step/Factory.cpp brlcad/trunk/src/conv/step/Factory.h brlcad/trunk/src/conv/step/FoundedItem.cpp brlcad/trunk/src/conv/step/FoundedItem.h brlcad/trunk/src/conv/step/FunctionallyDefinedTransformation.cpp brlcad/trunk/src/conv/step/FunctionallyDefinedTransformation.h brlcad/trunk/src/conv/step/GeometricRepresentationContext.cpp brlcad/trunk/src/conv/step/GeometricRepresentationContext.h brlcad/trunk/src/conv/step/GeometricRepresentationItem.cpp brlcad/trunk/src/conv/step/GeometricRepresentationItem.h brlcad/trunk/src/conv/step/GlobalUncertaintyAssignedContext.cpp brlcad/trunk/src/conv/step/GlobalUncertaintyAssignedContext.h brlcad/trunk/src/conv/step/GlobalUnitAssignedContext.cpp brlcad/trunk/src/conv/step/GlobalUnitAssignedContext.h brlcad/trunk/src/conv/step/Hyperbola.cpp brlcad/trunk/src/conv/step/Hyperbola.h brlcad/trunk/src/conv/step/IntersectionCurve.cpp brlcad/trunk/src/conv/step/IntersectionCurve.h brlcad/trunk/src/conv/step/LengthContextDependentUnit.cpp brlcad/trunk/src/conv/step/LengthContextDependentUnit.h brlcad/trunk/src/conv/step/LengthConversionBasedUnit.cpp brlcad/trunk/src/conv/step/LengthConversionBasedUnit.h brlcad/trunk/src/conv/step/LengthMeasureWithUnit.cpp brlcad/trunk/src/conv/step/LengthMeasureWithUnit.h brlcad/trunk/src/conv/step/LengthSiUnit.cpp brlcad/trunk/src/conv/step/LengthSiUnit.h brlcad/trunk/src/conv/step/LengthUnit.cpp brlcad/trunk/src/conv/step/LengthUnit.h brlcad/trunk/src/conv/step/Line.cpp brlcad/trunk/src/conv/step/Line.h brlcad/trunk/src/conv/step/LocalUnits.cpp brlcad/trunk/src/conv/step/LocalUnits.h brlcad/trunk/src/conv/step/Loop.cpp brlcad/trunk/src/conv/step/Loop.h brlcad/trunk/src/conv/step/LuminousIntensityContextDependentUnit.cpp brlcad/trunk/src/conv/step/LuminousIntensityContextDependentUnit.h brlcad/trunk/src/conv/step/LuminousIntensityConversionBasedUnit.cpp brlcad/trunk/src/conv/step/LuminousIntensityConversionBasedUnit.h brlcad/trunk/src/conv/step/LuminousIntensitySiUnit.cpp brlcad/trunk/src/conv/step/LuminousIntensitySiUnit.h brlcad/trunk/src/conv/step/LuminousIntensityUnit.cpp brlcad/trunk/src/conv/step/LuminousIntensityUnit.h brlcad/trunk/src/conv/step/ManifoldSolidBrep.cpp brlcad/trunk/src/conv/step/ManifoldSolidBrep.h brlcad/trunk/src/conv/step/MassContextDependentUnit.cpp brlcad/trunk/src/conv/step/MassContextDependentUnit.h brlcad/trunk/src/conv/step/MassConversionBasedUnit.cpp brlcad/trunk/src/conv/step/MassConversionBasedUnit.h brlcad/trunk/src/conv/step/MassSiUnit.cpp brlcad/trunk/src/conv/step/MassSiUnit.h brlcad/trunk/src/conv/step/MassUnit.cpp brlcad/trunk/src/conv/step/MassUnit.h brlcad/trunk/src/conv/step/MeasureValue.cpp brlcad/trunk/src/conv/step/MeasureValue.h brlcad/trunk/src/conv/step/MeasureWithUnit.cpp brlcad/trunk/src/conv/step/MeasureWithUnit.h brlcad/trunk/src/conv/step/NamedUnit.cpp brlcad/trunk/src/conv/step/NamedUnit.h brlcad/trunk/src/conv/step/OffsetCurve2D.cpp brlcad/trunk/src/conv/step/OffsetCurve2D.h brlcad/trunk/src/conv/step/OffsetCurve3D.cpp brlcad/trunk/src/conv/step/OffsetCurve3D.h brlcad/trunk/src/conv/step/OffsetSurface.cpp brlcad/trunk/src/conv/step/OffsetSurface.h brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp brlcad/trunk/src/conv/step/OrientedEdge.cpp brlcad/trunk/src/conv/step/OrientedEdge.h brlcad/trunk/src/conv/step/PCurve.cpp brlcad/trunk/src/conv/step/PCurve.h brlcad/trunk/src/conv/step/PCurveOrSurface.cpp brlcad/trunk/src/conv/step/PCurveOrSurface.h brlcad/trunk/src/conv/step/Parabola.cpp brlcad/trunk/src/conv/step/Parabola.h brlcad/trunk/src/conv/step/ParametricRepresentationContext.cpp brlcad/trunk/src/conv/step/ParametricRepresentationContext.h brlcad/trunk/src/conv/step/Path.cpp brlcad/trunk/src/conv/step/Path.h brlcad/trunk/src/conv/step/Placement.cpp brlcad/trunk/src/conv/step/Placement.h brlcad/trunk/src/conv/step/Plane.cpp brlcad/trunk/src/conv/step/Plane.h brlcad/trunk/src/conv/step/PlaneAngleContextDependentUnit.cpp brlcad/trunk/src/conv/step/PlaneAngleContextDependentUnit.h brlcad/trunk/src/conv/step/PlaneAngleConversionBasedUnit.cpp brlcad/trunk/src/conv/step/PlaneAngleConversionBasedUnit.h brlcad/trunk/src/conv/step/PlaneAngleMeasureWithUnit.cpp brlcad/trunk/src/conv/step/PlaneAngleMeasureWithUnit.h brlcad/trunk/src/conv/step/PlaneAngleSiUnit.cpp brlcad/trunk/src/conv/step/PlaneAngleSiUnit.h brlcad/trunk/src/conv/step/PlaneAngleUnit.cpp brlcad/trunk/src/conv/step/PlaneAngleUnit.h brlcad/trunk/src/conv/step/Point.cpp brlcad/trunk/src/conv/step/Point.h brlcad/trunk/src/conv/step/Polyline.cpp brlcad/trunk/src/conv/step/Polyline.h brlcad/trunk/src/conv/step/PullbackCurve.cpp brlcad/trunk/src/conv/step/PullbackCurve.h brlcad/trunk/src/conv/step/QuasiUniformCurve.cpp brlcad/trunk/src/conv/step/QuasiUniformCurve.h brlcad/trunk/src/conv/step/QuasiUniformSurface.cpp brlcad/trunk/src/conv/step/QuasiUniformSurface.h brlcad/trunk/src/conv/step/RatioContextDependentUnit.cpp brlcad/trunk/src/conv/step/RatioContextDependentUnit.h brlcad/trunk/src/conv/step/RatioConversionBasedUnit.cpp brlcad/trunk/src/conv/step/RatioConversionBasedUnit.h brlcad/trunk/src/conv/step/RatioSiUnit.cpp brlcad/trunk/src/conv/step/RatioSiUnit.h brlcad/trunk/src/conv/step/RatioUnit.cpp brlcad/trunk/src/conv/step/RatioUnit.h brlcad/trunk/src/conv/step/RationalBSplineCurve.cpp brlcad/trunk/src/conv/step/RationalBSplineCurve.h brlcad/trunk/src/conv/step/RationalBSplineCurveWithKnots.cpp brlcad/trunk/src/conv/step/RationalBSplineCurveWithKnots.h brlcad/trunk/src/conv/step/RationalBSplineSurface.cpp brlcad/trunk/src/conv/step/RationalBSplineSurface.h brlcad/trunk/src/conv/step/RationalBSplineSurfaceWithKnots.cpp brlcad/trunk/src/conv/step/RationalBSplineSurfaceWithKnots.h brlcad/trunk/src/conv/step/RationalBezierCurve.cpp brlcad/trunk/src/conv/step/RationalBezierCurve.h brlcad/trunk/src/conv/step/RationalBezierSurface.cpp brlcad/trunk/src/conv/step/RationalBezierSurface.h brlcad/trunk/src/conv/step/RationalQuasiUniformCurve.cpp brlcad/trunk/src/conv/step/RationalQuasiUniformCurve.h brlcad/trunk/src/conv/step/RationalQuasiUniformSurface.cpp brlcad/trunk/src/conv/step/RationalQuasiUniformSurface.h brlcad/trunk/src/conv/step/RationalUniformCurve.cpp brlcad/trunk/src/conv/step/RationalUniformCurve.h brlcad/trunk/src/conv/step/RationalUniformSurface.cpp brlcad/trunk/src/conv/step/RationalUniformSurface.h brlcad/trunk/src/conv/step/RectangularCompositeSurface.cpp brlcad/trunk/src/conv/step/RectangularCompositeSurface.h brlcad/trunk/src/conv/step/RectangularTrimmedSurface.cpp brlcad/trunk/src/conv/step/RectangularTrimmedSurface.h brlcad/trunk/src/conv/step/Representation.cpp brlcad/trunk/src/conv/step/Representation.h brlcad/trunk/src/conv/step/RepresentationContext.cpp brlcad/trunk/src/conv/step/RepresentationContext.h brlcad/trunk/src/conv/step/RepresentationItem.cpp brlcad/trunk/src/conv/step/RepresentationItem.h brlcad/trunk/src/conv/step/SeamCurve.cpp brlcad/trunk/src/conv/step/SeamCurve.h brlcad/trunk/src/conv/step/ShapeRepresentation.cpp brlcad/trunk/src/conv/step/ShapeRepresentation.h brlcad/trunk/src/conv/step/SiUnit.cpp brlcad/trunk/src/conv/step/SiUnit.h brlcad/trunk/src/conv/step/SolidAngleContextDependentUnit.cpp brlcad/trunk/src/conv/step/SolidAngleContextDependentUnit.h brlcad/trunk/src/conv/step/SolidAngleConversionBasedUnit.cpp brlcad/trunk/src/conv/step/SolidAngleConversionBasedUnit.h brlcad/trunk/src/conv/step/SolidAngleSiUnit.cpp brlcad/trunk/src/conv/step/SolidAngleSiUnit.h brlcad/trunk/src/conv/step/SolidAngleUnit.cpp brlcad/trunk/src/conv/step/SolidAngleUnit.h brlcad/trunk/src/conv/step/SolidModel.cpp brlcad/trunk/src/conv/step/SolidModel.h brlcad/trunk/src/conv/step/SphericalSurface.cpp brlcad/trunk/src/conv/step/SphericalSurface.h brlcad/trunk/src/conv/step/Surface.cpp brlcad/trunk/src/conv/step/Surface.h brlcad/trunk/src/conv/step/SurfaceCurve.cpp brlcad/trunk/src/conv/step/SurfaceCurve.h brlcad/trunk/src/conv/step/SurfaceOfLinearExtrusion.cpp brlcad/trunk/src/conv/step/SurfaceOfLinearExtrusion.h brlcad/trunk/src/conv/step/SurfaceOfRevolution.cpp brlcad/trunk/src/conv/step/SurfaceOfRevolution.h brlcad/trunk/src/conv/step/SurfacePatch.cpp brlcad/trunk/src/conv/step/SurfacePatch.h brlcad/trunk/src/conv/step/SurfaceReplica.cpp brlcad/trunk/src/conv/step/SurfaceReplica.h brlcad/trunk/src/conv/step/SweptSurface.cpp brlcad/trunk/src/conv/step/SweptSurface.h brlcad/trunk/src/conv/step/ThermodynamicTemperatureContextDependentUnit.cpp brlcad/trunk/src/conv/step/ThermodynamicTemperatureContextDependentUnit.h brlcad/trunk/src/conv/step/ThermodynamicTemperatureConversionBasedUnit.cpp brlcad/trunk/src/conv/step/ThermodynamicTemperatureConversionBasedUnit.h brlcad/trunk/src/conv/step/ThermodynamicTemperatureSiUnit.cpp brlcad/trunk/src/conv/step/ThermodynamicTemperatureSiUnit.h brlcad/trunk/src/conv/step/ThermodynamicTemperatureUnit.cpp brlcad/trunk/src/conv/step/ThermodynamicTemperatureUnit.h brlcad/trunk/src/conv/step/TimeContextDependentUnit.cpp brlcad/trunk/src/conv/step/TimeContextDependentUnit.h brlcad/trunk/src/conv/step/TimeConversionBasedUnit.cpp brlcad/trunk/src/conv/step/TimeConversionBasedUnit.h brlcad/trunk/src/conv/step/TimeSiUnit.cpp brlcad/trunk/src/conv/step/TimeSiUnit.h brlcad/trunk/src/conv/step/TimeUnit.cpp brlcad/trunk/src/conv/step/TimeUnit.h brlcad/trunk/src/conv/step/TopologicalRepresentationItem.cpp brlcad/trunk/src/conv/step/TopologicalRepresentationItem.h brlcad/trunk/src/conv/step/ToroidalSurface.cpp brlcad/trunk/src/conv/step/ToroidalSurface.h brlcad/trunk/src/conv/step/TrimmedCurve.cpp brlcad/trunk/src/conv/step/TrimmedCurve.h brlcad/trunk/src/conv/step/TrimmingSelect.cpp brlcad/trunk/src/conv/step/TrimmingSelect.h brlcad/trunk/src/conv/step/UncertaintyMeasureWithUnit.cpp brlcad/trunk/src/conv/step/UncertaintyMeasureWithUnit.h brlcad/trunk/src/conv/step/UniformCurve.cpp brlcad/trunk/src/conv/step/UniformCurve.h brlcad/trunk/src/conv/step/UniformSurface.cpp brlcad/trunk/src/conv/step/UniformSurface.h brlcad/trunk/src/conv/step/Unit.cpp brlcad/trunk/src/conv/step/Unit.h brlcad/trunk/src/conv/step/Vector.cpp brlcad/trunk/src/conv/step/Vector.h brlcad/trunk/src/conv/step/Vertex.cpp brlcad/trunk/src/conv/step/Vertex.h brlcad/trunk/src/conv/step/VertexLoop.cpp brlcad/trunk/src/conv/step/VertexLoop.h brlcad/trunk/src/conv/step/VertexPoint.cpp brlcad/trunk/src/conv/step/VertexPoint.h brlcad/trunk/src/conv/step/VolumeContextDependentUnit.cpp brlcad/trunk/src/conv/step/VolumeContextDependentUnit.h brlcad/trunk/src/conv/step/VolumeConversionBasedUnit.cpp brlcad/trunk/src/conv/step/VolumeConversionBasedUnit.h brlcad/trunk/src/conv/step/VolumeSiUnit.cpp brlcad/trunk/src/conv/step/VolumeSiUnit.h brlcad/trunk/src/conv/step/VolumeUnit.cpp brlcad/trunk/src/conv/step/VolumeUnit.h brlcad/trunk/src/conv/step/step-g.cpp Modified: brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp =================================================================== --- brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -88,3 +88,12 @@ TAB(level); cout << "Inherited Attributes:" << endl; ShapeRepresentation::Print(level); } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h =================================================================== --- brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -55,3 +55,13 @@ }; #endif /* ADVANCEDBREPSHAPEREPRESENTATION_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/AdvancedFace.cpp =================================================================== --- brlcad/trunk/src/conv/step/AdvancedFace.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AdvancedFace.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -97,3 +97,12 @@ } return true; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/AdvancedFace.h =================================================================== --- brlcad/trunk/src/conv/step/AdvancedFace.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AdvancedFace.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* ADVANCEDFACE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -93,3 +93,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* AMOUNTOFSUBSTANCECONTEXTDEPENDENTUNIT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -96,3 +96,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* AMOUNTOFSUBSTANCECONVERSIONBASEDUNIT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -93,3 +93,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* AMOUNTOFSUBSTANCESIUNIT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -88,3 +88,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -47,3 +47,13 @@ }; #endif /* AMOUNTOFSUBSTANCEUNIT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/AreaContextDependentUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AreaContextDependentUnit.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AreaContextDependentUnit.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -93,3 +93,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/AreaContextDependentUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AreaContextDependentUnit.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AreaContextDependentUnit.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* AREACONTEXTDEPENDENTUNIT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/AreaConversionBasedUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AreaConversionBasedUnit.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AreaConversionBasedUnit.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -96,3 +96,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/AreaConversionBasedUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AreaConversionBasedUnit.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AreaConversionBasedUnit.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* AREACONVERSIONBASEDUNIT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/AreaSiUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AreaSiUnit.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AreaSiUnit.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -92,3 +92,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/AreaSiUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AreaSiUnit.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AreaSiUnit.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* AREASIUNIT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/AreaUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AreaUnit.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AreaUnit.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -88,3 +88,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/AreaUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AreaUnit.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/AreaUnit.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -47,3 +47,13 @@ }; #endif /* AREAUNIT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/Axis1Placement.cpp =================================================================== --- brlcad/trunk/src/conv/step/Axis1Placement.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Axis1Placement.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -155,3 +155,12 @@ cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/Axis1Placement.h =================================================================== --- brlcad/trunk/src/conv/step/Axis1Placement.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Axis1Placement.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -60,3 +60,13 @@ }; #endif /* AXIS1_PLACEMENT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/Axis2Placement.cpp =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Axis2Placement.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -130,3 +130,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/Axis2Placement.h =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Axis2Placement.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -60,3 +60,13 @@ }; #endif /* AXIS2PLACEMENT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/Axis2Placement2D.cpp =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement2D.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Axis2Placement2D.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -177,3 +177,12 @@ cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/Axis2Placement2D.h =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement2D.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Axis2Placement2D.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -61,3 +61,13 @@ }; #endif /* AXIS2_PLACEMENT_2D_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/Axis2Placement3D.cpp =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement3D.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Axis2Placement3D.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -278,3 +278,12 @@ //cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return true; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/Axis2Placement3D.h =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement3D.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Axis2Placement3D.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -62,3 +62,13 @@ }; #endif /* AXIS2_PLACEMENT_3D_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BRLCADWrapper.cpp =================================================================== --- brlcad/trunk/src/conv/step/BRLCADWrapper.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BRLCADWrapper.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -107,3 +107,12 @@ return true; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BRLCADWrapper.h =================================================================== --- brlcad/trunk/src/conv/step/BRLCADWrapper.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BRLCADWrapper.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -45,3 +45,13 @@ }; #endif /* BRLCADWRAPPER_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BSplineCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/BSplineCurve.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BSplineCurve.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -194,3 +194,12 @@ return false; } */ + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BSplineCurve.h =================================================================== --- brlcad/trunk/src/conv/step/BSplineCurve.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BSplineCurve.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -67,3 +67,13 @@ }; #endif /* BSPLINECURVE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BSplineCurveWithKnots.cpp =================================================================== --- brlcad/trunk/src/conv/step/BSplineCurveWithKnots.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BSplineCurveWithKnots.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -154,3 +154,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BSplineCurveWithKnots.h =================================================================== --- brlcad/trunk/src/conv/step/BSplineCurveWithKnots.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BSplineCurveWithKnots.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -59,3 +59,13 @@ }; #endif /* BSPLINECURVEWITHKNOTS_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BSplineSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/BSplineSurface.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BSplineSurface.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -155,3 +155,12 @@ BSplineSurface::Form() { return B_spline_surface_form_string[surface_form]; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BSplineSurface.h =================================================================== --- brlcad/trunk/src/conv/step/BSplineSurface.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BSplineSurface.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -69,3 +69,13 @@ }; #endif /* BSPLINESURFACE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.cpp =================================================================== --- brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -191,3 +191,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.h =================================================================== --- brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -60,3 +60,13 @@ }; #endif /* BSPLINESURFACEWITHKNOTS_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BezierCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/BezierCurve.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BezierCurve.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -89,3 +89,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BezierCurve.h =================================================================== --- brlcad/trunk/src/conv/step/BezierCurve.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BezierCurve.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* BEZIERCURVE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BezierSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/BezierSurface.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BezierSurface.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -87,3 +87,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BezierSurface.h =================================================================== --- brlcad/trunk/src/conv/step/BezierSurface.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BezierSurface.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -49,3 +49,13 @@ }; #endif /* BEZIERSURFACE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BoundaryCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/BoundaryCurve.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BoundaryCurve.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -93,3 +93,12 @@ cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BoundaryCurve.h =================================================================== --- brlcad/trunk/src/conv/step/BoundaryCurve.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BoundaryCurve.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* BOUNDARY_CURVE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BoundedCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/BoundedCurve.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BoundedCurve.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -106,3 +106,12 @@ cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BoundedCurve.h =================================================================== --- brlcad/trunk/src/conv/step/BoundedCurve.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BoundedCurve.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -50,3 +50,13 @@ }; #endif /* BOUNDEDCURVE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BoundedPCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/BoundedPCurve.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BoundedPCurve.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -112,3 +112,12 @@ cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BoundedPCurve.h =================================================================== --- brlcad/trunk/src/conv/step/BoundedPCurve.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BoundedPCurve.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -51,3 +51,13 @@ }; #endif /* BOUNDEDPCURVE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BoundedSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/BoundedSurface.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BoundedSurface.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -93,3 +93,12 @@ return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BoundedSurface.h =================================================================== --- brlcad/trunk/src/conv/step/BoundedSurface.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BoundedSurface.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -47,3 +47,13 @@ }; #endif /* BOUNDEDSURFACE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/BoundedSurfaceCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/BoundedSurfaceCurve.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BoundedSurfaceCurve.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -110,3 +110,12 @@ cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/BoundedSurfaceCurve.h =================================================================== --- brlcad/trunk/src/conv/step/BoundedSurfaceCurve.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/BoundedSurfaceCurve.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -51,3 +51,13 @@ }; #endif /* BOUNDEDSURFACECURVE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/CartesianPoint.cpp =================================================================== --- brlcad/trunk/src/conv/step/CartesianPoint.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CartesianPoint.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -119,3 +119,12 @@ return true; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/CartesianPoint.h =================================================================== --- brlcad/trunk/src/conv/step/CartesianPoint.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CartesianPoint.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -55,3 +55,13 @@ }; #endif /* CARTESIANPOINT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/CartesianTransformationOperator.cpp =================================================================== --- brlcad/trunk/src/conv/step/CartesianTransformationOperator.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CartesianTransformationOperator.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -153,3 +153,12 @@ cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/CartesianTransformationOperator.h =================================================================== --- brlcad/trunk/src/conv/step/CartesianTransformationOperator.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CartesianTransformationOperator.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -57,3 +57,13 @@ }; #endif /* CARTESIANTRANSFORMATIONOPERATOR_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/CartesianTransformationOperator2D.cpp =================================================================== --- brlcad/trunk/src/conv/step/CartesianTransformationOperator2D.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CartesianTransformationOperator2D.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -93,3 +93,12 @@ cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/CartesianTransformationOperator2D.h =================================================================== --- brlcad/trunk/src/conv/step/CartesianTransformationOperator2D.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CartesianTransformationOperator2D.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* CARTESIAN_TRANSFORMATION_OPERATOR_2D_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/CartesianTransformationOperator3D.cpp =================================================================== --- brlcad/trunk/src/conv/step/CartesianTransformationOperator3D.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CartesianTransformationOperator3D.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -114,3 +114,12 @@ cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/CartesianTransformationOperator3D.h =================================================================== --- brlcad/trunk/src/conv/step/CartesianTransformationOperator3D.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CartesianTransformationOperator3D.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -51,3 +51,13 @@ }; #endif /* CARTESIAN_TRANSFORMATION_OPERATOR_3D_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/Circle.cpp =================================================================== --- brlcad/trunk/src/conv/step/Circle.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Circle.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -95,3 +95,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/Circle.h =================================================================== --- brlcad/trunk/src/conv/step/Circle.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Circle.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -53,3 +53,13 @@ }; #endif /* CIRCLE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/ClosedShell.cpp =================================================================== --- brlcad/trunk/src/conv/step/ClosedShell.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/ClosedShell.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -94,3 +94,12 @@ } return true; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/ClosedShell.h =================================================================== --- brlcad/trunk/src/conv/step/ClosedShell.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/ClosedShell.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* CLOSEDSHELL_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/CompositeCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/CompositeCurve.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CompositeCurve.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -139,3 +139,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/CompositeCurve.h =================================================================== --- brlcad/trunk/src/conv/step/CompositeCurve.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CompositeCurve.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -54,3 +54,13 @@ }; #endif /* COMPOSITECURVE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/CompositeCurveOnSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/CompositeCurveOnSurface.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CompositeCurveOnSurface.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -93,3 +93,12 @@ cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/CompositeCurveOnSurface.h =================================================================== --- brlcad/trunk/src/conv/step/CompositeCurveOnSurface.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CompositeCurveOnSurface.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* COMPOSITE_CURVE_ON_SURFACE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/CompositeCurveSegment.cpp =================================================================== --- brlcad/trunk/src/conv/step/CompositeCurveSegment.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CompositeCurveSegment.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -118,3 +118,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/CompositeCurveSegment.h =================================================================== --- brlcad/trunk/src/conv/step/CompositeCurveSegment.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/CompositeCurveSegment.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -52,3 +52,13 @@ }; #endif /* COMPOSITECURVESEGMENT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/Conic.cpp =================================================================== --- brlcad/trunk/src/conv/step/Conic.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Conic.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -145,3 +145,12 @@ cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; return false; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/Conic.h =================================================================== --- brlcad/trunk/src/conv/step/Conic.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/Conic.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -68,3 +68,13 @@ }; #endif /* CONIC_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/ConicalSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/ConicalSurface.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/ConicalSurface.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -115,3 +115,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/ConicalSurface.h =================================================================== --- brlcad/trunk/src/conv/step/ConicalSurface.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/ConicalSurface.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -54,3 +54,13 @@ }; #endif /* CONICAL_SURFACE_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/ConnectedFaceSet.cpp =================================================================== --- brlcad/trunk/src/conv/step/ConnectedFaceSet.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/ConnectedFaceSet.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -137,3 +137,12 @@ } return true; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/ConnectedFaceSet.h =================================================================== --- brlcad/trunk/src/conv/step/ConnectedFaceSet.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/ConnectedFaceSet.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -53,3 +53,13 @@ }; #endif /* CONNECTEDFACESET_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/ContextDependentUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/ContextDependentUnit.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/ContextDependentUnit.cpp 2009-10-30 15:12:51 UTC (rev 36357) @@ -97,3 +97,12 @@ return (*i).second; } } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/ContextDependentUnit.h =================================================================== --- brlcad/trunk/src/conv/step/ContextDependentUnit.h 2009-10-30 14:59:37 UTC (rev 36356) +++ brlcad/trunk/src/conv/step/ContextDependentUnit.h 2009-10-30 15:12:51 UTC (rev 36357) @@ -48,3 +48,13 @@ }; #endif /* CONTEXTDEPENDENTUNIT_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/ConversionBasedUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/ConversionBasedUnit.cpp 2009-10-30 14:59:37 UTC (rev 36356) +++ br... [truncated message content] |
From: <sta...@us...> - 2009-10-30 15:17:40
|
Revision: 36358 http://brlcad.svn.sourceforge.net/brlcad/?rev=36358&view=rev Author: starseeker Date: 2009-10-30 15:17:33 +0000 (Fri, 30 Oct 2009) Log Message: ----------- Get a few more files that aren't NIST copies. Modified Paths: -------------- brlcad/trunk/src/conv/step/STEPEntity.cpp brlcad/trunk/src/conv/step/STEPEntity.h brlcad/trunk/src/conv/step/STEPWrapper.cpp brlcad/trunk/src/conv/step/STEPWrapper.h Modified: brlcad/trunk/src/conv/step/STEPEntity.cpp =================================================================== --- brlcad/trunk/src/conv/step/STEPEntity.cpp 2009-10-30 15:12:51 UTC (rev 36357) +++ brlcad/trunk/src/conv/step/STEPEntity.cpp 2009-10-30 15:17:33 UTC (rev 36358) @@ -1,8 +1,26 @@ -/* +/* S T E P E N T I T Y . C P P + * BRL-CAD + * + * Copyright (c) 2009 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + */ +/** @file STEPEntity.cpp + * * STEPEntity.cpp * - * Created on: May 7, 2009 - * Author: wbowman */ #include "STEPEntity.h" @@ -24,3 +42,12 @@ STEPWrapper *STEPEntity::Step() { return step; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/STEPEntity.h =================================================================== --- brlcad/trunk/src/conv/step/STEPEntity.h 2009-10-30 15:12:51 UTC (rev 36357) +++ brlcad/trunk/src/conv/step/STEPEntity.h 2009-10-30 15:17:33 UTC (rev 36358) @@ -1,8 +1,26 @@ -/* +/* S T E P E N T I T Y . H + * BRL-CAD + * + * Copyright (c) 2009 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + */ +/** @file STEPEntity.h + * * STEPEntity.h * - * Created on: May 7, 2009 - * Author: wbowman */ #ifndef STEPENTITY_H_ @@ -42,3 +60,13 @@ }; #endif /* STEPENTITY_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ Modified: brlcad/trunk/src/conv/step/STEPWrapper.cpp =================================================================== --- brlcad/trunk/src/conv/step/STEPWrapper.cpp 2009-10-30 15:12:51 UTC (rev 36357) +++ brlcad/trunk/src/conv/step/STEPWrapper.cpp 2009-10-30 15:17:33 UTC (rev 36358) @@ -1092,3 +1092,12 @@ } return retValue; } + +// Local Variables: +// tab-width: 8 +// mode: C++ +// c-basic-offset: 4 +// indent-tabs-mode: t +// c-file-style: "stroustrup" +// End: +// ex: shiftwidth=4 tabstop=8 Modified: brlcad/trunk/src/conv/step/STEPWrapper.h =================================================================== --- brlcad/trunk/src/conv/step/STEPWrapper.h 2009-10-30 15:12:51 UTC (rev 36357) +++ brlcad/trunk/src/conv/step/STEPWrapper.h 2009-10-30 15:17:33 UTC (rev 36358) @@ -137,3 +137,13 @@ }; #endif /* STEPWRAPPER_H_ */ + +/* + * Local Variables: + * tab-width: 8 + * mode: C + * indent-tabs-mode: t + * c-file-style: "stroustrup" + * End: + * ex: shiftwidth=4 tabstop=8 + */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2009-10-30 18:41:56
|
Revision: 36359 http://brlcad.svn.sourceforge.net/brlcad/?rev=36359&view=rev Author: starseeker Date: 2009-10-30 18:41:48 +0000 (Fri, 30 Oct 2009) Log Message: ----------- Put headers on PullBackCurve files Modified Paths: -------------- brlcad/trunk/src/conv/step/PullbackCurve.cpp brlcad/trunk/src/conv/step/PullbackCurve.h Modified: brlcad/trunk/src/conv/step/PullbackCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-10-30 15:17:33 UTC (rev 36358) +++ brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-10-30 18:41:48 UTC (rev 36359) @@ -1,3 +1,27 @@ +/* P U L L B A C K C U R V E . C P P + * BRL-CAD + * + * Copyright (c) 2009 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + */ +/** @file PullbackCurve.cpp + * + * Pull curve back into UV space from 3D space + * + */ #include "common.h" Modified: brlcad/trunk/src/conv/step/PullbackCurve.h =================================================================== --- brlcad/trunk/src/conv/step/PullbackCurve.h 2009-10-30 15:17:33 UTC (rev 36358) +++ brlcad/trunk/src/conv/step/PullbackCurve.h 2009-10-30 18:41:48 UTC (rev 36359) @@ -1,3 +1,50 @@ +/* P U L L B A C K C U R V E . H + * BRL-CAD + * + * Copyright (c) 2009 United States Government as represented by + * the U.S. Army Research Laboratory. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this file; see the file named COPYING for more + * information. + */ +/** @file PullbackCurve.h + * + * Pull an arbitrary model-space *curve* onto the given *surface* as a + * curve within the surface's domain when, for each point c = C(t) on + * the curve and the closest point s = S(u, v) on the surface, we have: + * distance(c, s) <= *tolerance*. + * + * The resulting 2-dimensional curve will be approximated using the + * following process: + * + * 1. Adaptively sample the 3d curve in the domain of the surface + * (ensure tolerance constraint). Sampling terminates when the + * following flatness criterion is met: + * + * given two parameters on the curve t1 and t2 (which map to points p1 and p2 on the curve) + * let m be a parameter randomly chosen near the middle of the interval [t1, t2] + * ____ + * + * then the curve between t1 and t2 is flat if distance(C(m), p1p2) < flatness + * + * 2. Use the sampled points to perform a global interpolation using + * universal knot generation to build a B-Spline curve. + * + * 3. If the curve is a line or an arc (determined with openNURBS routines), + * return the appropriate ON_Curve subclass (otherwise, return an ON_NurbsCurve). + * + */ + #ifndef PULLBACK_CURVE #define PULLBACK_CURVE @@ -6,29 +53,8 @@ /* p u l l b a c k _ c u r v e * -* Pull an arbitrary model-space *curve* onto the given *surface* as a -* curve within the surface's domain when, for each point c = C(t) on -* the curve and the closest point s = S(u, v) on the surface, we have: -* distance(c, s) <= *tolerance*. + * -* The resulting 2-dimensional curve will be approximated using the -* following process: -* -* 1. Adaptively sample the 3d curve in the domain of the surface -* (ensure tolerance constraint). Sampling terminates when the -* following flatness criterion is met: -* given two parameters on the curve t1 and t2 (which map to points p1 and p2 on the curve) -* let m be a parameter randomly chosen near the middle of the interval [t1, t2] -* ____ -* then the curve between t1 and t2 is flat if distance(C(m), p1p2) < flatness -* -* 2. Use the sampled points to perform a global interpolation using -* universal knot generation to build a B-Spline curve. -* -* 3. If the curve is a line or an arc (determined with openNURBS routines), -* return the appropriate ON_Curve subclass (otherwise, return an ON_NurbsCurve). -* -* */ enum seam_direction { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2009-10-30 18:51:24
|
Revision: 36360 http://brlcad.svn.sourceforge.net/brlcad/?rev=36360&view=rev Author: starseeker Date: 2009-10-30 18:51:16 +0000 (Fri, 30 Oct 2009) Log Message: ----------- Switch from using std namespace to explicitly prefixing with std:: (per brlcad's advice) Modified Paths: -------------- brlcad/trunk/src/conv/step/BRLCADWrapper.cpp brlcad/trunk/src/conv/step/BRLCADWrapper.h brlcad/trunk/src/conv/step/PullbackCurve.cpp brlcad/trunk/src/conv/step/STEPEntity.h brlcad/trunk/src/conv/step/STEPWrapper.h brlcad/trunk/src/conv/step/step-g.cpp Modified: brlcad/trunk/src/conv/step/BRLCADWrapper.cpp =================================================================== --- brlcad/trunk/src/conv/step/BRLCADWrapper.cpp 2009-10-30 18:41:48 UTC (rev 36359) +++ brlcad/trunk/src/conv/step/BRLCADWrapper.cpp 2009-10-30 18:51:16 UTC (rev 36360) @@ -27,8 +27,6 @@ #include <string> #include <iostream> -using namespace std; - #include "BRLCADWrapper.h" extern "C" { @@ -79,20 +77,20 @@ } bool -BRLCADWrapper::WriteBrep(string name,ON_Brep *brep) { - ostringstream str; - string strcnt; +BRLCADWrapper::WriteBrep(std::string name, ON_Brep *brep) { + std::ostringstream str; + std::string strcnt; + + if (name.empty()) { + name = filename; + } + //TODO: need to do some name checks here for now static + //region/solid number increment + str << sol_reg_cnt++; + strcnt = str.str(); + std::string sol = name + strcnt + ".s"; + std::string reg = name + strcnt + ".r"; - if (name.empty()) { - name = filename; - } - //TODO: need to do some name checks here for now static - //region/solid number increment - str << sol_reg_cnt++; - strcnt = str.str(); - string sol = name + strcnt + ".s"; - string reg = name + strcnt + ".r"; - mk_brep(outfp, sol.c_str(), brep); unsigned char rgb[] = {200,180,180}; mk_region1(outfp, reg.c_str(), sol.c_str(), "plastic", "", rgb); Modified: brlcad/trunk/src/conv/step/BRLCADWrapper.h =================================================================== --- brlcad/trunk/src/conv/step/BRLCADWrapper.h 2009-10-30 18:41:48 UTC (rev 36359) +++ brlcad/trunk/src/conv/step/BRLCADWrapper.h 2009-10-30 18:51:16 UTC (rev 36360) @@ -30,18 +30,18 @@ class BRLCADWrapper { private: - string filename; - struct rt_wdb *outfp; - static int sol_reg_cnt; + std::string filename; + struct rt_wdb *outfp; + static int sol_reg_cnt; public: - BRLCADWrapper(); - virtual ~BRLCADWrapper(); - bool OpenFile( const char * flnm); - bool WriteHeader(); - bool WriteSphere(double *center, double radius); - bool WriteBrep(string name,ON_Brep *brep); - bool Close(); + BRLCADWrapper(); + virtual ~BRLCADWrapper(); + bool OpenFile( const char * flnm); + bool WriteHeader(); + bool WriteSphere(double *center, double radius); + bool WriteBrep(std::string name,ON_Brep *brep); + bool Close(); }; #endif /* BRLCADWRAPPER_H_ */ Modified: brlcad/trunk/src/conv/step/PullbackCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-10-30 18:41:48 UTC (rev 36359) +++ brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-10-30 18:51:16 UTC (rev 36360) @@ -38,7 +38,6 @@ #include "PullbackCurve.h" -using namespace std; using namespace brlcad; #define RANGE_HI 0.55 Modified: brlcad/trunk/src/conv/step/STEPEntity.h =================================================================== --- brlcad/trunk/src/conv/step/STEPEntity.h 2009-10-30 18:41:48 UTC (rev 36359) +++ brlcad/trunk/src/conv/step/STEPEntity.h 2009-10-30 18:51:16 UTC (rev 36360) @@ -30,7 +30,6 @@ #include <vector> #include <list> #include <map> -using namespace std; class STEPWrapper; class ON_Brep; Modified: brlcad/trunk/src/conv/step/STEPWrapper.h =================================================================== --- brlcad/trunk/src/conv/step/STEPWrapper.h 2009-10-30 18:41:48 UTC (rev 36359) +++ brlcad/trunk/src/conv/step/STEPWrapper.h 2009-10-30 18:51:16 UTC (rev 36360) @@ -38,8 +38,6 @@ #include <map> #include <vector> -using namespace std; - #include <sdai.h> #include <STEPattribute.h> Modified: brlcad/trunk/src/conv/step/step-g.cpp =================================================================== --- brlcad/trunk/src/conv/step/step-g.cpp 2009-10-30 18:41:48 UTC (rev 36359) +++ brlcad/trunk/src/conv/step/step-g.cpp 2009-10-30 18:51:16 UTC (rev 36360) @@ -45,9 +45,6 @@ InstMgr instance_list; -using namespace std; - - void usage() { cerr << "Usage: step-g -o outfile.g infile.stp \n" << endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ind...@us...> - 2009-11-02 16:10:38
|
Revision: 36361 http://brlcad.svn.sourceforge.net/brlcad/?rev=36361&view=rev Author: indianlarry Date: 2009-11-02 16:10:31 +0000 (Mon, 02 Nov 2009) Log Message: ----------- Removed virtual function definitions for PointAtStart(), PointAtEnd() use base class definition instead. Modified Paths: -------------- brlcad/trunk/src/conv/step/BoundedCurve.cpp brlcad/trunk/src/conv/step/BoundedCurve.h Modified: brlcad/trunk/src/conv/step/BoundedCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/BoundedCurve.cpp 2009-10-30 18:51:16 UTC (rev 36360) +++ brlcad/trunk/src/conv/step/BoundedCurve.cpp 2009-11-02 16:10:31 UTC (rev 36361) @@ -58,19 +58,7 @@ return true; } -const double * -BoundedCurve::PointAtEnd() { - cerr << CLASSNAME << ": Error: virtual function PointAtEnd() not implemented for this type of curve."; - return NULL; -} -const double * -BoundedCurve::PointAtStart() { - cerr << CLASSNAME << ": Error: virtual function PointAtStart() not implemented for this type of curve."; - return NULL; -} - - void BoundedCurve::Print(int level) { TAB(level); cout << CLASSNAME << ":" << name << "("; Modified: brlcad/trunk/src/conv/step/BoundedCurve.h =================================================================== --- brlcad/trunk/src/conv/step/BoundedCurve.h 2009-10-30 18:51:16 UTC (rev 36360) +++ brlcad/trunk/src/conv/step/BoundedCurve.h 2009-11-02 16:10:31 UTC (rev 36361) @@ -41,8 +41,6 @@ BoundedCurve(STEPWrapper *sw,int STEPid); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); - virtual const double *PointAtEnd(); - virtual const double *PointAtStart(); virtual void Print(int level); //static methods This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ind...@us...> - 2009-11-02 16:20:30
|
Revision: 36362 http://brlcad.svn.sourceforge.net/brlcad/?rev=36362&view=rev Author: indianlarry Date: 2009-11-02 16:20:23 +0000 (Mon, 02 Nov 2009) Log Message: ----------- Added namespace usage statement for "std" and cleaned up full references. Modified Paths: -------------- brlcad/trunk/src/conv/step/BRLCADWrapper.cpp brlcad/trunk/src/conv/step/BRLCADWrapper.h brlcad/trunk/src/conv/step/STEPEntity.h brlcad/trunk/src/conv/step/STEPWrapper.h Modified: brlcad/trunk/src/conv/step/BRLCADWrapper.cpp =================================================================== --- brlcad/trunk/src/conv/step/BRLCADWrapper.cpp 2009-11-02 16:10:31 UTC (rev 36361) +++ brlcad/trunk/src/conv/step/BRLCADWrapper.cpp 2009-11-02 16:20:23 UTC (rev 36362) @@ -27,6 +27,8 @@ #include <string> #include <iostream> +using namespace std; + #include "BRLCADWrapper.h" extern "C" { @@ -77,20 +79,20 @@ } bool -BRLCADWrapper::WriteBrep(std::string name, ON_Brep *brep) { - std::ostringstream str; - std::string strcnt; - - if (name.empty()) { - name = filename; - } - //TODO: need to do some name checks here for now static - //region/solid number increment - str << sol_reg_cnt++; - strcnt = str.str(); - std::string sol = name + strcnt + ".s"; - std::string reg = name + strcnt + ".r"; +BRLCADWrapper::WriteBrep(string name,ON_Brep *brep) { + ostringstream str; + string strcnt; + if (name.empty()) { + name = filename; + } + //TODO: need to do some name checks here for now static + //region/solid number increment + str << sol_reg_cnt++; + strcnt = str.str(); + string sol = name + strcnt + ".s"; + string reg = name + strcnt + ".r"; + mk_brep(outfp, sol.c_str(), brep); unsigned char rgb[] = {200,180,180}; mk_region1(outfp, reg.c_str(), sol.c_str(), "plastic", "", rgb); Modified: brlcad/trunk/src/conv/step/BRLCADWrapper.h =================================================================== --- brlcad/trunk/src/conv/step/BRLCADWrapper.h 2009-11-02 16:10:31 UTC (rev 36361) +++ brlcad/trunk/src/conv/step/BRLCADWrapper.h 2009-11-02 16:20:23 UTC (rev 36362) @@ -30,18 +30,18 @@ class BRLCADWrapper { private: - std::string filename; - struct rt_wdb *outfp; - static int sol_reg_cnt; + string filename; + struct rt_wdb *outfp; + static int sol_reg_cnt; public: - BRLCADWrapper(); - virtual ~BRLCADWrapper(); - bool OpenFile( const char * flnm); - bool WriteHeader(); - bool WriteSphere(double *center, double radius); - bool WriteBrep(std::string name,ON_Brep *brep); - bool Close(); + BRLCADWrapper(); + virtual ~BRLCADWrapper(); + bool OpenFile( const char * flnm); + bool WriteHeader(); + bool WriteSphere(double *center, double radius); + bool WriteBrep(string name,ON_Brep *brep); + bool Close(); }; #endif /* BRLCADWRAPPER_H_ */ Modified: brlcad/trunk/src/conv/step/STEPEntity.h =================================================================== --- brlcad/trunk/src/conv/step/STEPEntity.h 2009-11-02 16:10:31 UTC (rev 36361) +++ brlcad/trunk/src/conv/step/STEPEntity.h 2009-11-02 16:20:23 UTC (rev 36362) @@ -31,6 +31,8 @@ #include <list> #include <map> +using namespace std; + class STEPWrapper; class ON_Brep; Modified: brlcad/trunk/src/conv/step/STEPWrapper.h =================================================================== --- brlcad/trunk/src/conv/step/STEPWrapper.h 2009-11-02 16:10:31 UTC (rev 36361) +++ brlcad/trunk/src/conv/step/STEPWrapper.h 2009-11-02 16:20:23 UTC (rev 36362) @@ -38,6 +38,8 @@ #include <map> #include <vector> +using namespace std; + #include <sdai.h> #include <STEPattribute.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ind...@us...> - 2009-11-05 22:13:00
|
Revision: 36423 http://brlcad.svn.sourceforge.net/brlcad/?rev=36423&view=rev Author: indianlarry Date: 2009-11-05 22:12:46 +0000 (Thu, 05 Nov 2009) Log Message: ----------- Cleaned up and removed some debugging/dead code from pullback routines, added some developmental routines as initial start to edge tightening Modified Paths: -------------- brlcad/trunk/src/conv/step/Curve.cpp brlcad/trunk/src/conv/step/Curve.h brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp brlcad/trunk/src/conv/step/PullbackCurve.cpp brlcad/trunk/src/conv/step/PullbackCurve.h brlcad/trunk/src/conv/step/STEPWrapper.cpp brlcad/trunk/src/conv/step/STEPWrapper.h brlcad/trunk/src/conv/step/SweptSurface.cpp brlcad/trunk/src/conv/step/step-g.cpp Modified: brlcad/trunk/src/conv/step/Curve.cpp =================================================================== --- brlcad/trunk/src/conv/step/Curve.cpp 2009-11-05 22:03:11 UTC (rev 36422) +++ brlcad/trunk/src/conv/step/Curve.cpp 2009-11-05 22:12:46 UTC (rev 36423) @@ -123,6 +123,18 @@ } } +void +Curve::Start(Vertex *v) { + trimmed=false; + start = v; +} + +void +Curve::End(Vertex *v) { + trimmed=false; + end = v; +} + STEPEntity * Curve::Create(STEPWrapper *sw,SCLP23(Application_instance) *sse){ Factory::OBJECTS::iterator i; Modified: brlcad/trunk/src/conv/step/Curve.h =================================================================== --- brlcad/trunk/src/conv/step/Curve.h 2009-11-05 22:03:11 UTC (rev 36422) +++ brlcad/trunk/src/conv/step/Curve.h 2009-11-05 22:12:46 UTC (rev 36423) @@ -67,8 +67,8 @@ virtual void Print(int level); virtual void SetParameterTrim(double start, double end); void SetPointTrim(const double *start, const double *end); - void Start(Vertex *v) { trimmed=false; start = v; }; - void End(Vertex *v) { trimmed=false; end = v; }; + void Start(Vertex *v); + void End(Vertex *v); //static methods static STEPEntity *Create(STEPWrapper *sw,SCLP23(Application_instance) *sse); Modified: brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp =================================================================== --- brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2009-11-05 22:03:11 UTC (rev 36422) +++ brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2009-11-05 22:12:46 UTC (rev 36423) @@ -795,6 +795,10 @@ AddFace(brep); + //TODO: remove debugging code + if ((false) && ( ON_id == 39 )) { + cerr << "We are here" << endl; + } if (!Face::LoadONBrep(brep)) { cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; return false; @@ -986,6 +990,10 @@ ON_id = edge_element->GetONId(); + //TODO: remove debugging code + if ((false) && (ON_id == 31 )) { + cerr << "We are here!!!" << endl; + } return true; } @@ -1020,6 +1028,10 @@ return false; } } + //TODO: remove debugging code + if ((false) && (id == 124)) { + cerr << "We are here." << endl; + } if (!LoadONTrimmingCurves(brep)) { return false; } @@ -1067,334 +1079,196 @@ return false; } -bool -Path::LoadONTrimmingCurves(ON_Brep *brep) +bool Path::LoadONTrimmingCurves(ON_Brep *brep) { ON_TextLog tl; - LIST_OF_ORIENTED_EDGES::iterator i; - list<PBCData *> curve_pullback_samples; + LIST_OF_ORIENTED_EDGES::iterator i; + list<PBCData *> curve_pullback_samples; const ON_BrepLoop* loop = &brep->m_L[ON_path_index]; const ON_BrepFace* face = loop->Face(); const ON_Surface* surface = face->SurfaceOf(); - -/* - //First let's check to see if we have to shift the surface seam - double t; - if ( surface->IsClosed(0) || surface->IsClosed(1) ) - { - //TODO: look for other closed surfaces to assess like this - if (ShiftSurfaceSeam(brep,&t)) { - ON_Surface* surf = (ON_Surface*)surface; - ON_Cylinder cylinder; - ON_Cone cone; - if ( surface->IsCylinder(&cylinder) ) { - surf->Rotate(t,cylinder.Axis(),cylinder.Center()); - } //else if ( surface->IsCone(&cone) ) { - //surf->Rotate(t,cone.Axis(),cone.BasePoint()); - //} - } - } -*/ - - // build surface tree making sure not to remove trimmed subsurfaces // since currently building trims and need full tree bool removeTrimmed = false; - SurfaceTree* st = new SurfaceTree((ON_BrepFace*)face, removeTrimmed); + SurfaceTree* st = new SurfaceTree((ON_BrepFace*) face, removeTrimmed); - + //TODO: remove debugging code + if ((false) && (id == 33316)) { + cerr << "We are here !!!" << endl; + } PBCData *data = NULL; - LIST_OF_ORIENTED_EDGES::iterator prev,next; - for(i=edge_list.begin();i!=edge_list.end();i++) { - // grab the curve for this edge,face and surface - const ON_BrepEdge* edge = &brep->m_E[(*i)->GetONId()]; - const ON_Curve* curve = edge->EdgeCurveOf(); - ON_BoundingBox bb = curve->BoundingBox(); - ON_Curve* c2d; - bool orientWithCurve; - double t,nudge; - if (false && isSeam(i)) { - ON_2dPoint prev_uv,next_uv; - prev = getPrev(i); - next = getNext(i); - const ON_BrepEdge* edge = &brep->m_E[(*prev)->GetONId()]; - const ON_Curve* prev_curve = edge->EdgeCurveOf(); - orientWithCurve = (*prev)->OrientWithEdge(); - if (!orientWithCurve) { - t = 0.0; - nudge = 0.02; - } else { - t = 1.0; - nudge = -0.02; - } - ON_3dPoint P = prev_curve->PointAt(t); - toUV(st, (const ON_Curve *)prev_curve, prev_uv, t, nudge); + LIST_OF_ORIENTED_EDGES::iterator prev, next; + for (i = edge_list.begin(); i != edge_list.end(); i++) { + // grab the curve for this edge,face and surface + const ON_BrepEdge* edge = &brep->m_E[(*i)->GetONId()]; + const ON_Curve* curve = edge->EdgeCurveOf(); + ON_BoundingBox bb = curve->BoundingBox(); + bool orientWithCurve; - edge = &brep->m_E[(*next)->GetONId()]; - const ON_Curve* next_curve = edge->EdgeCurveOf(); - orientWithCurve = (*next)->OrientWithEdge(); - if (!orientWithCurve) { - t = 1.0; - nudge = -0.02; - } else { - t = 0.0; - nudge = 0.02; - } - ON_3dPoint N = next_curve->PointAt(t); - toUV(st, (const ON_Curve *)next_curve, next_uv, t, nudge); + data = pullback_samples(st, curve); + if (data == NULL) + continue; - ON_2dPoint uv1 = st->getClosestPointEstimate(P); - ON_2dPoint uv2 = st->getClosestPointEstimate(N); - enum seam_direction dir = seam_direction(prev_uv,next_uv); - - c2d = pullback_seam_curve(dir, st, curve); - orientWithCurve = (*i)->OrientWithEdge(); - } else { - ON_2dPoint uv; - orientWithCurve = (*i)->OrientWithEdge(); - if (!orientWithCurve) { - t = 1.0; - nudge = -0.0000001; - } else { - t = 0.0; - nudge = 0.0000001; - } - toUV(st, (const ON_Curve *)curve, uv, t + nudge,0.0); - ON_Interval dom = curve->Domain(); - const ON_3dPoint p = curve->PointAt(dom[0]); - const ON_3dPoint from = curve->PointAt(dom[0]+nudge); - if ( !st->getSurfacePoint(p,uv,from) > 0 ) { - cerr << "Error: Can not get surface point." << endl; - } -// ON_Interval u = surface->Domain(0); -// ON_Interval v = surface->Domain(1); -// ON_3dPoint startuv(u[0],v[0],0.0); -// ON_3dPoint enduv(u[1],v[0],0.0); -// c2d = surface->Pullback( *curve,1.0e-6,NULL,startuv,enduv); - //c2d = pullback_curve(st, curve); - //c2d = test2_pullback_curve(st, curve); - data = test2_pullback_samples(st, curve); - if (!orientWithCurve) { - data->order_reversed = true; - } else { - data->order_reversed = false; - } - data->edge = edge; - curve_pullback_samples.push_back(data); - if (!orientWithCurve) { - list<ON_2dPointArray*>::iterator si; - si = data->segments.begin(); - list<ON_2dPointArray*> rsegs; - while (si != data->segments.end()) { - ON_2dPointArray* samples = (*si); - samples->Reverse(); - rsegs.push_front(samples); - si++; - } - data->segments.clear(); - si = rsegs.begin(); - while (si != rsegs.end()) { - ON_2dPointArray* samples = (*si); - data->segments.push_back(samples); - si++; - } - rsegs.clear(); - } - - //ON_Curve* testcurve = c2d->Duplicate(); - //c2d = brlcad::pullback_curve((ON_BrepFace*)face,curve); - } - /* - if (!orientWithCurve) { - c2d->Reverse(); - data->order_reversed = true; - } else { - data->order_reversed = false; + if (!orientWithCurve) { + data->order_reversed = true; + } else { + data->order_reversed = false; + } + data->edge = edge; + curve_pullback_samples.push_back(data); + if (!orientWithCurve) { + list<ON_2dPointArray*>::iterator si; + si = data->segments.begin(); + list<ON_2dPointArray*> rsegs; + while (si != data->segments.end()) { + ON_2dPointArray* samples = (*si); + samples->Reverse(); + rsegs.push_front(samples); + si++; } - */ + data->segments.clear(); + si = rsegs.begin(); + while (si != rsegs.end()) { + ON_2dPointArray* samples = (*si); + data->segments.push_back(samples); + si++; + } + rsegs.clear(); } - // check for seams and singularities - if ( !check_pullback_data(curve_pullback_samples) ) { - cerr << "Error: Can not resolve seam or singularity issues." << endl; - } - list<PBCData *>::iterator cs = curve_pullback_samples.begin(); - list<PBCData *>::iterator next_cs; - int trimcnt = 0; -// while(cs!=curve_pullback_samples.end()) { -// PBCData *data = (*cs); -// int ilast = data->samples.Count() - 1; -// cerr << "T:" << trimcnt++ << endl; -// cerr << " start - " << data->samples[0].x << "," << data->samples[0].y << endl; -// cerr << " end - " << data->samples[ilast].x << "," << data->samples[ilast].y << endl; -// cs++; -// } -// cs = curve_pullback_samples.begin(); -/* - //TODO: check validate routine with boggle - //ugly hack to get trim endpoint tolerance happy - while(cs!=curve_pullback_samples.end()) { - ON_2dPoint end_current,start_next; - PBCData *data = (*cs); + } + // check for seams and singularities + if (!check_pullback_data(curve_pullback_samples)) { + cerr << "Error: Can not resolve seam or singularity issues." << endl; + } + list<PBCData *>::iterator cs = curve_pullback_samples.begin(); + list<PBCData *>::iterator next_cs; + int trimcnt = 0; + cs = curve_pullback_samples.begin(); + while (cs != curve_pullback_samples.end()) { + next_cs = cs; + next_cs++; + if (next_cs == curve_pullback_samples.end()) + next_cs = curve_pullback_samples.begin(); + PBCData *data = (*cs); + list<ON_2dPointArray*>::iterator si; + si = data->segments.begin(); + PBCData *ndata = (*next_cs); + list<ON_2dPointArray*>::iterator nsi; + nsi = ndata->segments.begin(); + ON_2dPointArray* nsamples = (*nsi); - next_cs = cs; - next_cs++; - if (next_cs == curve_pullback_samples.end()) - next_cs = curve_pullback_samples.begin(); - end_current=data->samples[data->samples.Count()-1]; - start_next=(*next_cs)->samples[0]; - //TODO: check over tolerance here - double d = end_current.DistanceTo(start_next); - if (d <= 0.0001) { - data->samples[data->samples.Count()-1].x = start_next.x; - data->samples[data->samples.Count()-1].y = start_next.y; - } - cs++; - } -*/ - cs = curve_pullback_samples.begin(); - while(cs!=curve_pullback_samples.end()) { - next_cs = cs; - next_cs++; - if (next_cs == curve_pullback_samples.end()) - next_cs = curve_pullback_samples.begin(); - PBCData *data = (*cs); - list<ON_2dPointArray*>::iterator si; - si = data->segments.begin(); + while (si != data->segments.end()) { + nsi = si; + nsi++; + if (nsi == data->segments.end()) { PBCData *ndata = (*next_cs); - list<ON_2dPointArray*>::iterator nsi; - nsi = ndata->segments.begin(); - ON_2dPointArray* nsamples = (*nsi); + nsi = ndata->segments.begin(); + } + ON_2dPointArray* samples = (*si); + nsamples = (*nsi); - while (si != data->segments.end()) { - nsi = si; - nsi++; - if (nsi == data->segments.end()) { - PBCData *ndata = (*next_cs); - nsi = ndata->segments.begin(); - } - ON_2dPointArray* samples = (*si); - nsamples = (*nsi); + //TODO:Fix this shouldn't have sample counts less than 2 + if (samples->Count() < 2) { + si++; + continue; + } + int trimCurve = brep->m_C2.Count(); + //TODO: remove debugging code + if ((false) && (trimCurve == 68)) { + cerr << "We are here!!!" << endl; + } + ON_Curve* c2d = interpolateCurve(*samples); + brep->m_C2.Append(c2d); - //TODO:Fix this shouldn't have sample counts less than 2 - if (samples->Count() < 2) { - si++; - continue; - } - ON_Curve* c2d = interpolateCurve(*samples); - int trimCurve = brep->m_C2.Count(); - brep->m_C2.Append(c2d); + ON_BrepTrim& trim = brep->NewTrim((ON_BrepEdge&) *data->edge, data->order_reversed, (ON_BrepLoop&) *loop, trimCurve); + trim.m_tolerance[0] = 1e-3; // XXX: tolerance? + trim.m_tolerance[1] = 1e-3; + ON_Interval PD = trim.ProxyCurveDomain(); + trim.m_iso = surface->IsIsoparametric(*c2d, &PD); - ON_BrepTrim& trim = brep->NewTrim((ON_BrepEdge&)*data->edge, data->order_reversed, (ON_BrepLoop&)*loop, trimCurve); - trim.m_tolerance[0] = 1e-3; // XXX: tolerance? - trim.m_tolerance[1] = 1e-3; - ON_Interval PD = trim.ProxyCurveDomain(); - trim.m_iso = surface->IsIsoparametric(*c2d, &PD); + if (!trim.IsValid(&tl)) { + ON_NurbsCurve nurbs_curve; + c2d->GetNurbForm(nurbs_curve); + cerr << "Num_knots - " << nurbs_curve.KnotCount() << endl; + cerr << "CV count - " << nurbs_curve.CVCount() << endl; + //knot[17959]=0.310448 >= knot[17960]=0.310448 + for (int i = 17955; i < 17970; i++) { + cerr << "Knot[" << i << "] - " << nurbs_curve.Knot(i) << endl; + } + for (int i = 17955; i < 17970; i++) { + ON_3dPoint p; + nurbs_curve.GetCV(i, p); + cerr << "CV[" << i << "] - " << p.x << "," << p.y << endl; + } + for (int i = 8970; i < 8989; i++) { + cerr << "samples[" << i << "] - " << (*samples)[i].x << "," << (*samples)[i].y << endl; + } + } - trim.IsValid(&tl); + int ilast = samples->Count() - 1; - int ilast = samples->Count() - 1; + // check for bridging trim, trims along singularities + // are implicitly expected + ON_2dPoint end_current, start_next; + end_current = (*samples)[samples->Count() - 1]; + start_next = (*nsamples)[0]; - // check for bridging trim, trims along singularities - // are implicitly expected - ON_2dPoint end_current,start_next; - end_current=(*samples)[samples->Count()-1]; - // //TODO:Fix this shouldn't have sample counts less than 2 - // while ((*next_cs)->samples.Count() < 2) { - // next_cs++; - // if (next_cs == curve_pullback_samples.end()) - // next_cs = curve_pullback_samples.begin(); - // } - start_next=(*nsamples)[0]; + if (end_current.DistanceTo(start_next) > PBC_TOL) { + //cerr << "endpoints don't connect" << endl; + int is; + const ON_Surface *surf = data->surftree->getSurface(); + if ((is = check_pullback_singularity_bridge(surf, end_current, start_next)) >= 0) { + // insert trim + //cerr << "insert singular trim along "; + // 0 = south, 1 = east, 2 = north, 3 = west + ON_Surface::ISO iso; + switch (is) { + case 0: + //south + iso = ON_Surface::S_iso; + break; + case 1: + //east + iso = ON_Surface::E_iso; + break; + case 2: + //north + iso = ON_Surface::N_iso; + break; + case 3: + //west + iso = ON_Surface::W_iso; + } - if (true && (end_current.DistanceTo(start_next) > PBC_TOL)) { - //cerr << "endpoints don't connect" << endl; - int is; - const ON_Surface *surf = data->surftree->getSurface(); - if ( (is=check_pullback_singularity_bridge(surf,end_current,start_next)) >= 0) { - // insert trim - //cerr << "insert singular trim along "; - // 0 = south, 1 = east, 2 = north, 3 = west - ON_Surface::ISO iso; - switch (is) { - case 0: - //south - iso = ON_Surface::S_iso; - break; - case 1: - //east - iso = ON_Surface::E_iso; - break; - case 2: - //north - iso = ON_Surface::N_iso; - break; - case 3: - //west - iso = ON_Surface::W_iso; - } + ON_Curve* c2d = new ON_LineCurve(end_current, start_next); + trimCurve = brep->m_C2.Count(); + brep->m_C2.Append(c2d); - ON_Curve* c2d = new ON_LineCurve(end_current,start_next); - trimCurve = brep->m_C2.Count(); - brep->m_C2.Append(c2d); + int vi; + if (data->order_reversed) + vi = data->edge->m_vi[0]; + else + vi = data->edge->m_vi[1]; - int vi; - if (data->order_reversed) - vi = data->edge->m_vi[0]; - else - vi = data->edge->m_vi[1]; + ON_BrepTrim& trim = brep->NewSingularTrim(brep->m_V[vi], (ON_BrepLoop&) *loop, iso, trimCurve); - ON_BrepTrim& trim = brep->NewSingularTrim(brep->m_V[vi],(ON_BrepLoop&)*loop,iso,trimCurve); - - trim.m_tolerance[0] = 1e-3; //TODO: need constant tolerance? - trim.m_tolerance[1] = 1e-3; - ON_Interval PD = trim.ProxyCurveDomain(); - trim.m_iso = surf->IsIsoparametric(*brep->m_C2[trimCurve], &PD); - trim.m_iso = iso; - //trim.Reverse(); - trim.IsValid(&tl); - } /*else if ((is=check_pullback_seam_bridge(surf,end_current,start_next)) > 0) { - ON_Surface::ISO iso; - switch (is) { - case 1: - //east - iso = ON_Surface::x_iso; - break; - case 2: - //north - iso = ON_Surface::y_iso; - break; - case 3: - //west - iso = ON_Surface::not_iso; - } - - ON_Curve* c2d = new ON_LineCurve(end_current,start_next); - trimCurve = brep->m_C2.Count(); - brep->m_C2.Append(c2d); - - int vi; - ON_BrepVertex& v = brep->NewVertex(end_current,1e-6); - - ON_BrepTrim& trim = brep->NewSingularTrim(v,(ON_BrepLoop&)*loop,iso,trimCurve); - - trim.m_tolerance[0] = 1e-3; //TODO: need constant tolerance? - trim.m_tolerance[1] = 1e-3; - ON_Interval PD = trim.ProxyCurveDomain(); - trim.m_iso = surf->IsIsoparametric(*brep->m_C2[trimCurve], &PD); - trim.m_iso = iso; - //trim.Reverse(); - trim.IsValid(&tl); - }*/ - } - si++; + trim.m_tolerance[0] = 1e-3; //TODO: need constant tolerance? + trim.m_tolerance[1] = 1e-3; + ON_Interval PD = trim.ProxyCurveDomain(); + trim.m_iso = surf->IsIsoparametric(*brep->m_C2[trimCurve], &PD); + trim.m_iso = iso; + //trim.Reverse(); + trim.IsValid(&tl); } - - cs++; + } + si++; } + cs++; + } - return true; + return true; } bool @@ -2714,21 +2588,6 @@ } bool -SweptSurface::LoadONBrep(ON_Brep *brep) -{ - if (ON_id >= 0) - return true; // already loaded - - if (!swept_curve->LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; - return false; - } - - return true; -} - - -bool VertexLoop::LoadONBrep(ON_Brep *brep) { //load vertex Modified: brlcad/trunk/src/conv/step/PullbackCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-11-05 22:03:11 UTC (rev 36422) +++ brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-11-05 22:12:46 UTC (rev 36423) @@ -36,6 +36,7 @@ #include "tnt.h" #include "jama_lu.h" #include "opennurbs_ext.h" +#include "brep.h" #include "PullbackCurve.h" @@ -46,7 +47,6 @@ #define RANGE_LO 0.45 #define UNIVERSAL_SAMPLE_COUNT 1001 -//numeric_limits<double> real; typedef struct _bspline { int p; // degree @@ -169,7 +169,7 @@ return UNKNOWN_SEAM_DIRECTION; } } -#define BREP_INTERSECTION_ROOT_EPSILON 1e-6 + bool toUV(PBCData& data, ON_2dPoint& out_pt, double t, double knudge=0.0) { ON_3dPoint pointOnCurve = data.curve->PointAt(t); @@ -188,7 +188,6 @@ } ON_3dVector dt; - double a,b; data.curve->Ev1Der(t,pointOnCurve,dt); ON_3dVector tangent = data.curve->TangentAt(t); //data.surf->GetClosestPoint(pointOnCurve,&a,&b,0.0001); @@ -214,7 +213,7 @@ dir.Reverse(); ON_Ray ray(pointOnCurve,dir); brep_get_plane_ray(ray,pr); - //know use this as guess to iterate to closer solution + //now use this as guess to iterate to closer solution pt2d_t Rcurr; pt2d_t new_uv; ON_3dPoint pt; @@ -250,7 +249,6 @@ ON_3dPoint pointOnCurve = curve->PointAt(t); ON_3dPoint knudgedPointOnCurve = curve->PointAt(t+knudge); ON_3dVector dt; - double a,b; curve->Ev1Der(t,pointOnCurve,dt); ON_3dVector tangent = curve->TangentAt(t); //data.surf->GetClosestPoint(pointOnCurve,&a,&b,0.0001); @@ -506,7 +504,6 @@ //generateParameters(spline); double u[num_segments+1]; - double U[2*(num_segments-1) + 8]; u[0] = 0.0; for(int k=0;k<num_segments;k++){ u[k+1] = u[k] + 3.0*(P[k][1]-P[k][0]).Length(); @@ -529,7 +526,6 @@ c->SetKnot(degree + 2*(i -1),knot_value); c->SetKnot(degree + 2*(i -1) + 1,knot_value); } - int k = c->KnotCount(); for (int i = m - p; i < m; i++) { c->SetKnot(i,1.0); } @@ -542,6 +538,102 @@ return c; } +ON_NurbsCurve* +interpolateLocalCubicCurve(ON_3dPointArray &Q) +{ + int num_samples = Q.Count(); + int num_segments = Q.Count() - 1; + int qsize = num_samples + 3; + ON_3dVector qarray[qsize]; + ON_3dVector *q = &qarray[1]; + + for (int i = 1; i < Q.Count(); i++) { + q[i] = Q[i] - Q[i - 1]; + } + q[0] = 2.0 * q[1] - q[2]; + q[-1] = 2.0 * q[0] - q[1]; + + q[num_samples] = 2 * q[num_samples - 1] - q[num_samples - 2]; + q[num_samples + 1] = 2 * q[num_samples] - q[num_samples - 1]; + q[num_samples + 2] = 2 * q[num_samples + 1] - q[num_samples]; + + ON_3dVector T[num_samples]; + double a[num_samples]; + for (int k = 0; k < num_samples; k++) { + ON_3dVector a = ON_CrossProduct(q[k - 1], q[k]); + ON_3dVector b = ON_CrossProduct(q[k + 1], q[k + 2]); + double alength = a.Length(); + if (NEAR_ZERO(alength,PBC_TOL)) { + a[k] = 1.0; + } else { + a[k] = (a.Length()) / (a.Length() + b.Length()); + } + T[k] = (1.0 - a[k]) * q[k] + a[k] * q[k + 1]; + T[k].Unitize(); + } + ON_3dPointArray P[num_samples - 1]; + ON_3dPointArray control_points; + control_points.Append(Q[0]); + for (int i = 1; i < num_samples; i++) { + ON_3dPoint P0 = Q[i - 1]; + ON_3dPoint P3 = Q[i]; + ON_3dVector T0 = T[i - 1]; + ON_3dVector T3 = T[i]; + + double a, b, c; + + ON_3dVector vT0T3 = T0 + T3; + ON_3dVector dP0P3 = P3 - P0; + a = 16.0 - vT0T3.Length() * vT0T3.Length(); + b = 12.0 * (dP0P3 * vT0T3); + c = -36.0 * dP0P3.Length() * dP0P3.Length(); + + double alpha = (-b + sqrt(b * b - 4.0 * a * c)) / (2.0 * a); + + ON_3dPoint P1 = P0 + (1.0 / 3.0) * alpha * T0; + control_points.Append(P1); + ON_3dPoint P2 = P3 - (1.0 / 3.0) * alpha * T3; + control_points.Append(P2); + P[i - 1].Append(P0); + P[i - 1].Append(P1); + P[i - 1].Append(P2); + P[i - 1].Append(P3); + } + control_points.Append(Q[num_samples - 1]); + + //generateParameters(spline); + double u[num_segments + 1]; + u[0] = 0.0; + for (int k = 0; k < num_segments; k++) { + u[k + 1] = u[k] + 3.0 * (P[k][1] - P[k][0]).Length(); + } + int degree = 3; + int n = control_points.Count(); + int p = degree; + int m = n + p - 1; + int dimension = 3; + ON_NurbsCurve* c = ON_NurbsCurve::New(dimension, false, degree + 1, n); + c->ReserveKnotCapacity(m); + for (int i = 0; i < degree; i++) { + c->SetKnot(i, 0.0); + } + for (int i = 1; i < num_segments; i++) { + double knot_value = u[i] / u[num_segments]; + c->SetKnot(degree + 2 * (i - 1), knot_value); + c->SetKnot(degree + 2 * (i - 1) + 1, knot_value); + } + for (int i = m - p; i < m; i++) { + c->SetKnot(i, 1.0); + } + + // insert the control points + for (int i = 0; i < n; i++) { + ON_3dPoint p = control_points[i]; + c->SetCV(i, p); + } + return c; +} + void generateControlPoints(BSpline& bspline, ON_2dPointArray &samples) { @@ -620,8 +712,9 @@ return nurbs; } else { + ON_TextLog dump; ON_NurbsCurve* nurbs; - if (samples.Count() < 1000) { + if (false) { //(samples.Count() < 1000) { // BSpline spline; spline.p = 3; spline.n = samples.Count()-1; @@ -630,9 +723,11 @@ generateParameters(spline); generateControlPoints(spline, samples); nurbs = newNURBSCurve(spline,2); + //nurbs->Dump(dump); } else { // local vs. global interpolation for large point sampled curves nurbs = interpolateLocalCubicCurve(samples); + //nurbs->Dump(dump); } return nurbs; } @@ -876,8 +971,9 @@ delete [] knots; return samples; } + PBCData * -test2_pullback_samples(const SurfaceTree* surfacetree, +pullback_samples(const SurfaceTree* surfacetree, const ON_Curve* curve, double tolerance, double flatness) { @@ -904,7 +1000,9 @@ if (samples2 != NULL) { data->segments.push_back(samples2); } - cerr << "need to divide curve across the seam" << endl; + //TODO: remove debugging code + if (false) + cerr << "need to divide curve across the seam" << endl; } else { ON_2dPointArray *samples = pullback_samples(data,tmin,tmax); if (samples != NULL) { @@ -929,6 +1027,213 @@ } return data; } + + +ON_Curve* +refit_edge(const ON_BrepEdge* edge, double tolerance) +{ + double edge_tolerance = 0.01; + ON_Brep *brep = edge->Brep(); + ON_3dPoint start = edge->PointAtStart(); + ON_3dPoint end = edge->PointAtEnd(); + + ON_BrepTrim& trim1 = brep->m_T[edge->m_ti[0]]; + ON_BrepTrim& trim2 = brep->m_T[edge->m_ti[1]]; + ON_BrepFace *face1 = trim1.Face(); + ON_BrepFace *face2 = trim2.Face(); + const ON_Surface *surface1 = face1->SurfaceOf(); + const ON_Surface *surface2 = face2->SurfaceOf(); + bool removeTrimmed = false; + SurfaceTree *st1 = new SurfaceTree(face1,removeTrimmed); + SurfaceTree *st2 = new SurfaceTree(face2,removeTrimmed); + + ON_Curve *curve = brep->m_C3[edge->m_c3i]; + double t0,t1; + curve->GetDomain(&t0,&t1); + ON_Plane plane; + curve->FrameAt(t0,plane); + ON_3dPoint origin = plane.Origin(); + ON_3dVector xaxis = plane.Xaxis(); + ON_3dVector yaxis = plane.Yaxis(); + ON_3dVector zaxis = plane.zaxis; + ON_3dPoint px = origin + xaxis; + ON_3dPoint py = origin + yaxis; + ON_3dPoint pz = origin + zaxis; + + int numKnots = curve->SpanCount(); + double *knots = new double[numKnots+1]; + curve->GetSpanVector(knots); + + int samplesperknotinterval; + int degree = curve->Degree(); + + if (degree > 1) { + samplesperknotinterval = 3*degree; + } else { + samplesperknotinterval = 18*degree; + } + ON_2dPoint pt; + double t = 0.0; + ON_3dPoint pointOnCurve; + ON_3dPoint knudgedPointOnCurve; + for (int i = 0; i <= numKnots; i++) { + if (i <= numKnots / 2) { + if (i > 0) { + double delta = (knots[i] - knots[i - 1]) / (double) samplesperknotinterval; + for (int j = 1; j < samplesperknotinterval; j++) { + t = knots[i - 1] + j * delta; + pointOnCurve = curve->PointAt(t); + knudgedPointOnCurve = curve->PointAt(t + PBC_TOL); + + ON_3dPoint point = pointOnCurve; + ON_3dPoint knudgepoint = knudgedPointOnCurve; + ON_3dPoint ps1; + ON_3dPoint ps2; + bool found = false; + double dist; + while (!found) { + ON_2dPoint uv; + if (st1->getSurfacePoint((const ON_3dPoint&) point, uv, (const ON_3dPoint&) knudgepoint, edge_tolerance) > 0) { + ps1 = surface1->PointAt(uv.x, uv.y); + if (st2->getSurfacePoint((const ON_3dPoint&) point, uv, (const ON_3dPoint&) knudgepoint, edge_tolerance) > 0) { + ps2 = surface2->PointAt(uv.x, uv.y); + } + } + dist = ps1.DistanceTo(ps2); + if (NEAR_ZERO(dist,PBC_TOL)) { + point = ps1; + found = true; + } else { + ON_3dVector v1 = ps1 - point; + ON_3dVector v2 = ps2 - point; + knudgepoint = point; + ON_3dVector deltav = v1 + v2; + if ( NEAR_ZERO(deltav.Length(),PBC_TOL) ) { + found = true; // as close as we are going to get + } else { + point = point + v1 + v2; + } + } + } + } + } + t = knots[i]; + pointOnCurve = curve->PointAt(t); + knudgedPointOnCurve = curve->PointAt(t + PBC_TOL); + ON_3dPoint point = pointOnCurve; + ON_3dPoint knudgepoint = knudgedPointOnCurve; + ON_3dPoint ps1; + ON_3dPoint ps2; + bool found = false; + double dist; + + while (!found) { + ON_2dPoint uv; + if (st1->getSurfacePoint((const ON_3dPoint&) point, uv, (const ON_3dPoint&) knudgepoint, edge_tolerance) > 0) { + ps1 = surface1->PointAt(uv.x, uv.y); + if (st2->getSurfacePoint((const ON_3dPoint&) point, uv, (const ON_3dPoint&) knudgepoint, edge_tolerance) > 0) { + ps2 = surface2->PointAt(uv.x, uv.y); + } + } + dist = ps1.DistanceTo(ps2); + if (NEAR_ZERO(dist,PBC_TOL)) { + point = ps1; + found = true; + } else { + ON_3dVector v1 = ps1 - point; + ON_3dVector v2 = ps2 - point; + knudgepoint = point; + ON_3dVector deltav = v1 + v2; + if ( NEAR_ZERO(deltav.Length(),PBC_TOL) ) { + found = true; // as close as we are going to get + } else { + point = point + v1 + v2; + } + } + } + } else { + if (i > 0) { + double delta = (knots[i] - knots[i - 1]) / (double) samplesperknotinterval; + for (int j = 1; j < samplesperknotinterval; j++) { + t = knots[i - 1] + j * delta; + pointOnCurve = curve->PointAt(t); + knudgedPointOnCurve = curve->PointAt(t - PBC_TOL); + + ON_3dPoint point = pointOnCurve; + ON_3dPoint knudgepoint = knudgedPointOnCurve; + ON_3dPoint ps1; + ON_3dPoint ps2; + bool found = false; + double dist; + + while (!found) { + ON_2dPoint uv; + if (st1->getSurfacePoint((const ON_3dPoint&) point, uv, (const ON_3dPoint&) knudgepoint, edge_tolerance) > 0) { + ps1 = surface1->PointAt(uv.x, uv.y); + if (st2->getSurfacePoint((const ON_3dPoint&) point, uv, (const ON_3dPoint&) knudgepoint, edge_tolerance) > 0) { + ps2 = surface2->PointAt(uv.x, uv.y); + } + } + dist = ps1.DistanceTo(ps2); + if (NEAR_ZERO(dist,PBC_TOL)) { + point = ps1; + found = true; + } else { + ON_3dVector v1 = ps1 - point; + ON_3dVector v2 = ps2 - point; + knudgepoint = point; + ON_3dVector deltav = v1 + v2; + if ( NEAR_ZERO(deltav.Length(),PBC_TOL) ) { + found = true; // as close as we are going to get + } else { + point = point + v1 + v2; + } + } + } + } + t = knots[i]; + pointOnCurve = curve->PointAt(t); + knudgedPointOnCurve = curve->PointAt(t - PBC_TOL); + ON_3dPoint point = pointOnCurve; + ON_3dPoint knudgepoint = knudgedPointOnCurve; + ON_3dPoint ps1; + ON_3dPoint ps2; + bool found = false; + double dist; + + while (!found) { + ON_2dPoint uv; + if (st1->getSurfacePoint((const ON_3dPoint&) point, uv, (const ON_3dPoint&) knudgepoint, edge_tolerance) > 0) { + ps1 = surface1->PointAt(uv.x, uv.y); + if (st2->getSurfacePoint((const ON_3dPoint&) point, uv, (const ON_3dPoint&) knudgepoint, edge_tolerance) > 0) { + ps2 = surface2->PointAt(uv.x, uv.y); + } + } + dist = ps1.DistanceTo(ps2); + if (NEAR_ZERO(dist,PBC_TOL)) { + point = ps1; + found = true; + } else { + ON_3dVector v1 = ps1 - point; + ON_3dVector v2 = ps2 - point; + knudgepoint = point; + ON_3dVector deltav = v1 + v2; + if ( NEAR_ZERO(deltav.Length(),PBC_TOL) ) { + found = true; // as close as we are going to get + } else { + point = point + v1 + v2; + } + } + } + } + } + } + delete [] knots; + + + return NULL; +} + bool has_singularity(const ON_Surface *surf) { bool ret = false; @@ -1422,7 +1727,6 @@ ///// Loop through and fix any seam ambiguities ON_2dPoint *prev = NULL; ON_2dPoint *next = NULL; - bool complete = true; cs = pbcs.begin(); while(cs!=pbcs.end()) { PBCData *data = (*cs); @@ -1444,12 +1748,12 @@ next = &(*samples)[0]; list<PBCData*>::reverse_iterator rcs(cs); rcs--; - PBCData *d1 = (*cs); - PBCData *d2 = (*rcs); list<ON_2dPointArray *>::reverse_iterator rsi(si); while (rcs != pbcs.rend()) { PBCData *rdata = (*rcs); if (data->segments.rend() == rdata->segments.rend() ) { + //TODO: remove debugging + if (false) cerr << "Ends match" << endl; } while(rsi != rdata->segments.rend()) { @@ -1636,9 +1940,13 @@ } else { for(int i = 0; i < samples->Count()-1; i++) { while ((i < (samples->Count()-1)) && (*samples)[i].DistanceTo((*samples)[i+1]) < 1e-9) { - cerr << "Sample Count was " << samples->Count(); + //TODO: remove debugging code + if (false) + cerr << "Sample Count was " << samples->Count(); samples->Remove(i+1); - cerr << " now " << samples->Count() << endl; + //TODO: remove debugging code + if (false) + cerr << " now " << samples->Count() << endl; } } si++; Modified: brlcad/trunk/src/conv/step/PullbackCurve.h =================================================================== --- brlcad/trunk/src/conv/step/PullbackCurve.h 2009-11-05 22:03:11 UTC (rev 36422) +++ brlcad/trunk/src/conv/step/PullbackCurve.h 2009-11-05 22:12:46 UTC (rev 36423) @@ -84,7 +84,12 @@ extern ON_Curve* interpolateCurve(ON_2dPointArray& samples); + extern ON_Curve* +refit_edge(const ON_BrepEdge* edge, + double tolerance); + +extern ON_Curve* test1_pullback_curve(const brlcad::SurfaceTree* surfacetree, const ON_Curve* curve, double tolerance = 1.0e-6, @@ -97,7 +102,7 @@ double flatness = 1.0e-3); extern PBCData * -test2_pullback_samples(const brlcad::SurfaceTree* surfacetree, +pullback_samples(const brlcad::SurfaceTree* surfacetree, const ON_Curve* curve, double tolerance = 1.0e-6, double flatness = 1.0e-3); Modified: brlcad/trunk/src/conv/step/STEPWrapper.cpp =================================================================== --- brlcad/trunk/src/conv/step/STEPWrapper.cpp 2009-11-05 22:03:11 UTC (rev 36422) +++ brlcad/trunk/src/conv/step/STEPWrapper.cpp 2009-11-05 22:12:46 UTC (rev 36423) @@ -75,6 +75,8 @@ // LocalUnits::solidangle = 1.0; ON_Brep *onBrep = aBrep->GetONBrep(); + //ON_Brep *tbrep = TightenBrep( onBrep ); + dotg->WriteBrep(name,onBrep); delete onBrep; Modified: brlcad/trunk/src/conv/step/STEPWrapper.h =================================================================== --- brlcad/trunk/src/conv/step/STEPWrapper.h 2009-11-05 22:03:11 UTC (rev 36422) +++ brlcad/trunk/src/conv/step/STEPWrapper.h 2009-11-05 22:12:46 UTC (rev 36423) @@ -31,7 +31,8 @@ cout << " "; \ } -#define TRACE(s) std::cerr << __FILE__ << ":" << __LINE__ << ":" << __func__ << ":" << s << std::endl; +//TODO +//#define TRACE(s) std::cerr << __FILE__ << ":" << __LINE__ << ":" << __func__ << ":" << s << std::endl; #define ERROR(s) std::cerr << __FILE__ << ":" << __LINE__ << ":" << __func__ << ":" << s << std::endl; #include <list> Modified: brlcad/trunk/src/conv/step/SweptSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/SweptSurface.cpp 2009-11-05 22:03:11 UTC (rev 36422) +++ brlcad/trunk/src/conv/step/SweptSurface.cpp 2009-11-05 22:12:46 UTC (rev 36423) @@ -104,6 +104,20 @@ } } +bool +SweptSurface::LoadONBrep(ON_Brep *brep) +{ + if (ON_id >= 0) + return true; // already loaded + + if (!swept_curve->LoadONBrep(brep)) { + cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + return false; + } + + return true; +} + // Local Variables: // tab-width: 8 // mode: C++ Modified: brlcad/trunk/src/conv/step/step-g.cpp =================================================================== --- brlcad/trunk/src/conv/step/step-g.cpp 2009-11-05 22:03:11 UTC (rev 36422) +++ brlcad/trunk/src/conv/step/step-g.cpp 2009-11-05 22:12:46 UTC (rev 36423) @@ -45,6 +45,9 @@ InstMgr instance_list; +using namespace std; + + void usage() { cerr << "Usage: step-g -o outfile.g infile.stp \n" << endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ind...@us...> - 2009-11-10 12:32:13
|
Revision: 36454 http://brlcad.svn.sourceforge.net/brlcad/?rev=36454&view=rev Author: indianlarry Date: 2009-11-10 12:32:00 +0000 (Tue, 10 Nov 2009) Log Message: ----------- Added openNURBS brep generation code for Toroidal and Spherical surfacs. Modified Paths: -------------- brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp brlcad/trunk/src/conv/step/SphericalSurface.cpp brlcad/trunk/src/conv/step/SphericalSurface.h brlcad/trunk/src/conv/step/ToroidalSurface.cpp brlcad/trunk/src/conv/step/ToroidalSurface.h Modified: brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp =================================================================== --- brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2009-11-10 12:02:55 UTC (rev 36453) +++ brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2009-11-10 12:32:00 UTC (rev 36454) @@ -88,6 +88,8 @@ #include "RationalBSplineSurfaceWithKnots.h" #include "RationalQuasiUniformSurface.h" #include "RationalUniformSurface.h" +#include "SphericalSurface.h" +#include "ToroidalSurface.h" #include "UniformSurface.h" #include "AdvancedBrepShapeRepresentation.h" @@ -2587,6 +2589,62 @@ return true; } +bool SphericalSurface::LoadONBrep(ON_Brep *brep) +{ + // get sphere center + ON_3dPoint center = GetOrigin(); + center = center * LocalUnits::length; + + // Creates a sphere with given center and radius. + ON_Sphere sphere(center, radius * LocalUnits::length); + + ON_RevSurface* s = sphere.RevSurfaceForm(); + if (s) { + double r = fabs(sphere.radius); + if ( r <= ON_SQRT_EPSILON ) + r = 1.0; + r *= ON_PI; + s->SetDomain(0,0.0,2.0*r); + s->SetDomain(1,-r,r); + } + ON_id = brep->AddSurface(s); + + return true; +} + +bool ToroidalSurface::LoadONBrep(ON_Brep *brep) +{ + ON_3dPoint origin = GetOrigin(); + ON_3dVector norm = GetNormal(); + ON_3dVector xaxis = GetXAxis(); + ON_3dVector yaxis = GetYAxis(); + + origin = origin * LocalUnits::length; + + ON_Plane p(origin, xaxis, yaxis); + + // Creates a torus parallel to the plane + // with given major and minor radius. + ON_Torus torus(p, major_radius * LocalUnits::length, minor_radius * LocalUnits::length); + + ON_RevSurface* s = torus.RevSurfaceForm(); + if (s) { + double r = fabs(torus.major_radius); + if (r <= ON_SQRT_EPSILON) + r = 1.0; + r *= ON_PI; + s->SetDomain(0, 0.0, 2.0 * r); + r = fabs(torus.minor_radius); + if (r <= ON_SQRT_EPSILON) + r = 1.0; + r *= ON_PI; + s->SetDomain(1, 0.0, 2.0 * r); + } + ON_id = brep->AddSurface(s); + + return true; +} + bool VertexLoop::LoadONBrep(ON_Brep *brep) { Modified: brlcad/trunk/src/conv/step/SphericalSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/SphericalSurface.cpp 2009-11-10 12:02:55 UTC (rev 36453) +++ brlcad/trunk/src/conv/step/SphericalSurface.cpp 2009-11-10 12:32:00 UTC (rev 36454) @@ -25,6 +25,8 @@ #include "STEPWrapper.h" #include "Factory.h" +#include "Axis2Placement3D.h" + #include "SphericalSurface.h" #define CLASSNAME "SphericalSurface" @@ -44,6 +46,27 @@ SphericalSurface::~SphericalSurface() { } +const double * +SphericalSurface::GetOrigin() { + return position->GetOrigin(); +} + +const double * +SphericalSurface::GetNormal() { + return position->GetAxis(2); +} + +const double * +SphericalSurface::GetXAxis() { + return position->GetXAxis(); +} + +const double * +SphericalSurface::GetYAxis() { + return position->GetYAxis(); +} + + bool SphericalSurface::Load(STEPWrapper *sw, SCLP23(Application_instance) *sse) { step=sw; @@ -91,15 +114,6 @@ return (*i).second; } } - -bool -SphericalSurface::LoadONBrep(ON_Brep *brep) -{ - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; - return false; -} - - // Local Variables: // tab-width: 8 // mode: C++ Modified: brlcad/trunk/src/conv/step/SphericalSurface.h =================================================================== --- brlcad/trunk/src/conv/step/SphericalSurface.h 2009-11-10 12:02:55 UTC (rev 36453) +++ brlcad/trunk/src/conv/step/SphericalSurface.h 2009-11-10 12:32:00 UTC (rev 36454) @@ -40,6 +40,10 @@ SphericalSurface(); virtual ~SphericalSurface(); SphericalSurface(STEPWrapper *sw,int STEPid); + const double *GetOrigin(); + const double *GetNormal(); + const double *GetXAxis(); + const double *GetYAxis(); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/ToroidalSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/ToroidalSurface.cpp 2009-11-10 12:02:55 UTC (rev 36453) +++ brlcad/trunk/src/conv/step/ToroidalSurface.cpp 2009-11-10 12:32:00 UTC (rev 36454) @@ -25,6 +25,8 @@ #include "STEPWrapper.h" #include "Factory.h" +#include "Axis2Placement3D.h" + #include "ToroidalSurface.h" #define CLASSNAME "ToroidalSurface" @@ -44,6 +46,26 @@ ToroidalSurface::~ToroidalSurface() { } +const double * +ToroidalSurface::GetOrigin() { + return position->GetOrigin(); +} + +const double * +ToroidalSurface::GetNormal() { + return position->GetAxis(2); +} + +const double * +ToroidalSurface::GetXAxis() { + return position->GetXAxis(); +} + +const double * +ToroidalSurface::GetYAxis() { + return position->GetYAxis(); +} + bool ToroidalSurface::Load(STEPWrapper *sw, SCLP23(Application_instance) *sse) { step=sw; @@ -94,14 +116,6 @@ } } -bool -ToroidalSurface::LoadONBrep(ON_Brep *brep) -{ - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; - return false; -} - - // Local Variables: // tab-width: 8 // mode: C++ Modified: brlcad/trunk/src/conv/step/ToroidalSurface.h =================================================================== --- brlcad/trunk/src/conv/step/ToroidalSurface.h 2009-11-10 12:02:55 UTC (rev 36453) +++ brlcad/trunk/src/conv/step/ToroidalSurface.h 2009-11-10 12:32:00 UTC (rev 36454) @@ -41,6 +41,10 @@ ToroidalSurface(); virtual ~ToroidalSurface(); ToroidalSurface(STEPWrapper *sw,int STEPid); + const double *GetOrigin(); + const double *GetNormal(); + const double *GetXAxis(); + const double *GetYAxis(); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ind...@us...> - 2009-12-03 18:48:46
|
Revision: 36787 http://brlcad.svn.sourceforge.net/brlcad/?rev=36787&view=rev Author: indianlarry Date: 2009-12-03 18:47:45 +0000 (Thu, 03 Dec 2009) Log Message: ----------- Added function to test if FaceBound is oriented. Modified Paths: -------------- brlcad/trunk/src/conv/step/FaceBound.cpp brlcad/trunk/src/conv/step/FaceBound.h Modified: brlcad/trunk/src/conv/step/FaceBound.cpp =================================================================== --- brlcad/trunk/src/conv/step/FaceBound.cpp 2009-12-03 17:05:22 UTC (rev 36786) +++ brlcad/trunk/src/conv/step/FaceBound.cpp 2009-12-03 18:47:45 UTC (rev 36787) @@ -97,6 +97,14 @@ TopologicalRepresentationItem::Print(level+1); } +bool +FaceBound::Oriented() { + if (orientation == SCLBOOL_H(BTrue)) { + return true; + } + return false; +} + STEPEntity * FaceBound::Create(STEPWrapper *sw, SCLP23(Application_instance) *sse) { Factory::OBJECTS::iterator i; Modified: brlcad/trunk/src/conv/step/FaceBound.h =================================================================== --- brlcad/trunk/src/conv/step/FaceBound.h 2009-12-03 17:05:22 UTC (rev 36786) +++ brlcad/trunk/src/conv/step/FaceBound.h 2009-12-03 18:47:45 UTC (rev 36787) @@ -60,6 +60,7 @@ bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); + bool Oriented(); void SetFaceIndex(int index) { ON_face_index = index; }; //static methods This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ind...@us...> - 2009-12-03 18:59:32
|
Revision: 36788 http://brlcad.svn.sourceforge.net/brlcad/?rev=36788&view=rev Author: indianlarry Date: 2009-12-03 18:59:17 +0000 (Thu, 03 Dec 2009) Log Message: ----------- Added PBC_SEAM_TOL definition to explicitly test trim point sample closeness to surface seam. Also using BREP_EDGE_MISS_TOLERANCE as tolerance input to SurfaceTree::getSurfacePoint(). Modified Paths: -------------- brlcad/trunk/src/conv/step/PullbackCurve.cpp brlcad/trunk/src/conv/step/PullbackCurve.h Modified: brlcad/trunk/src/conv/step/PullbackCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-12-03 18:47:45 UTC (rev 36787) +++ brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-12-03 18:59:17 UTC (rev 36788) @@ -176,7 +176,7 @@ ON_3dPoint knudgedPointOnCurve = data.curve->PointAt(t+knudge); ON_2dPoint uv; - if ( data.surftree->getSurfacePoint((const ON_3dPoint&)pointOnCurve,uv,(const ON_3dPoint&)knudgedPointOnCurve) > 0 ) { + if ( data.surftree->getSurfacePoint((const ON_3dPoint&)pointOnCurve,uv,(const ON_3dPoint&)knudgedPointOnCurve,BREP_EDGE_MISS_TOLERANCE) > 0 ) { out_pt.Set(uv.x,uv.y); return true; } else { @@ -740,7 +740,7 @@ if (!surf->IsClosed(i)) continue; double p = (i) ? v : u; - if (NEAR_EQUAL(p,surf->Domain(i)[0],PBC_TOL) || NEAR_EQUAL(p,surf->Domain(i)[1],PBC_TOL)) + if (NEAR_EQUAL(p,surf->Domain(i)[0],PBC_SEAM_TOL) || NEAR_EQUAL(p,surf->Domain(i)[1],PBC_SEAM_TOL)) rc += (i+1); } Modified: brlcad/trunk/src/conv/step/PullbackCurve.h =================================================================== --- brlcad/trunk/src/conv/step/PullbackCurve.h 2009-12-03 18:47:45 UTC (rev 36787) +++ brlcad/trunk/src/conv/step/PullbackCurve.h 2009-12-03 18:59:17 UTC (rev 36788) @@ -68,6 +68,7 @@ #define NEAR_EQUAL(_a, _b, _tol) (fabs((_a) - (_b)) <= _tol) #define PBC_TOL 0.000001 #define PBC_FROM_OFFSET 0.001 +#define PBC_SEAM_TOL 0.001 typedef struct pbc_data { double tolerance; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ind...@us...> - 2009-12-10 21:00:35
|
Revision: 36868 http://brlcad.svn.sourceforge.net/brlcad/?rev=36868&view=rev Author: indianlarry Date: 2009-12-10 21:00:26 +0000 (Thu, 10 Dec 2009) Log Message: ----------- Cleaned up check_pullback_seam_bridge() in pullback code, also adjusted bounds of linear extrude, conical and cylindrical surfaces. Added some debugging code related to trimming curves crossing seam bounaries(still WIP). Modified Paths: -------------- brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp brlcad/trunk/src/conv/step/PullbackCurve.cpp Modified: brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp =================================================================== --- brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2009-12-10 18:40:12 UTC (rev 36867) +++ brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2009-12-10 21:00:26 UTC (rev 36868) @@ -897,7 +897,6 @@ for (i = bounds.rbegin(); i != bounds.rend(); i++) { (*i)->SetFaceIndex(ON_id); if (!(*i)->LoadONBrep(brep)) { - //(*i)->GetONId() cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; return false; } @@ -1137,6 +1136,9 @@ ON_BoundingBox bb = curve->BoundingBox(); bool orientWithCurve = (*i)->OrientWithEdge(); + if ((true) && (id == 34193)) { + cerr << "Debug:LoadONTrimmingCurves for Path:" << id << endl; + } data = pullback_samples(st, curve); if (data == NULL) continue; @@ -1288,7 +1290,60 @@ trim.m_iso = iso; //trim.Reverse(); trim.IsValid(&tl); - } + } /*else if ((is = check_pullback_seam_bridge(surf, end_current, start_next)) >= 0) { + // insert trim + // insert singular trim along + // 0 = south, 1 = east, 2 = north, 3 = west + ON_Surface::ISO iso; + switch (is) { + case 0: + //south + iso = ON_Surface::S_iso; + break; + case 1: + //east + iso = ON_Surface::E_iso; + break; + case 2: + //north + iso = ON_Surface::N_iso; + break; + case 3: + //west + iso = ON_Surface::W_iso; + } + + ON_Curve* c2d = new ON_LineCurve(end_current, start_next); + trimCurve = brep->m_C2.Count(); + brep->m_C2.Append(c2d); + + int vi; + int vo; + if (data->order_reversed) { + vi = data->edge->m_vi[0]; + vo = data->edge->m_vi[1]; + } else { + vi = data->edge->m_vi[1]; + vo = data->edge->m_vi[0]; + } +#ifdef TREATASBOUNDARY + ON_BrepEdge& e = (ON_BrepEdge&)*data->edge; + ON_BrepTrim& trim = brep->NewTrim(e, false, (ON_BrepLoop&) *loop, trimCurve); + + trim.m_type = ON_BrepTrim::boundary; + trim.m_tolerance[0] = 1e-3; //TODO: need constant tolerance? + trim.m_tolerance[1] = 1e-3; +#else + ON_BrepTrim& trim = brep->NewSingularTrim(brep->m_V[vi], (ON_BrepLoop&) *loop, iso, trimCurve); + + trim.m_tolerance[0] = 1e-3; //TODO: need constant tolerance? + trim.m_tolerance[1] = 1e-3; + ON_Interval PD = trim.ProxyCurveDomain(); + trim.m_iso = surf->IsIsoparametric(*brep->m_C2[trimCurve], &PD); + trim.m_iso = iso; +#endif + trim.IsValid(&tl); + }*/ } si++; } @@ -1391,7 +1446,7 @@ double tan_semi_angle = tan(semi_angle * LocalUnits::planeangle); double height = (radius * LocalUnits::length) / tan_semi_angle; - double hplus = height * 1.01; + double hplus = height * 2.01; double r1 = hplus * tan_semi_angle; origin = origin + norm * (-height); @@ -2142,10 +2197,6 @@ if (ON_id >= 0) return true; // already loaded - // use trimming edge bounding box diagonal to make sure extrusion - // magnitude is correctly represented - double bbdiag = trim_curve_3d_bbox->Diagonal().Length(); - // load parent class if (!SweptSurface::LoadONBrep(brep)) { cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; @@ -2154,15 +2205,29 @@ ON_Curve *curve = brep->m_C3[swept_curve->GetONId()]; + // use trimming edge bounding box unioned with bounding box of + // curve being extruded; calc diagonal to make sure extrusion + // magnitude is well represented + ON_BoundingBox curvebb = curve->BoundingBox(); + trim_curve_3d_bbox->Union(curvebb); + double bbdiag = trim_curve_3d_bbox->Diagonal().Length(); // already converted to local units; + ON_3dPoint dir = extrusion_axis->Orientation(); double mag = extrusion_axis->Magnitude() * LocalUnits::length; mag = MAX(mag, bbdiag); - ON_3dPoint startpnt = swept_curve->PointAtStart(); + ON_3dPoint startpnt; + if (swept_curve->PointAtStart() == NULL) { + startpnt = curve->PointAtStart(); + } else { + startpnt = swept_curve->PointAtStart(); startpnt = startpnt * LocalUnits::length; + } + // add a little buffer in the surface extrusion distance + // by extruding "+/-mag" distance along "dir" ON_3dPoint extrusion_endpnt = startpnt + mag * dir; - ON_3dPoint extrusion_startpnt = startpnt; + ON_3dPoint extrusion_startpnt = startpnt - mag * dir; ON_LineCurve *l = new ON_LineCurve(extrusion_startpnt, extrusion_endpnt); @@ -2176,8 +2241,10 @@ ON_SumSurface* sum_srf = 0; - ON_Curve* srf_base_curve = brep->m_C3[swept_curve->GetONId()]->Duplicate(); - ON_3dPoint sum_basepoint = -ON_3dVector(l->PointAtStart()); + ON_Curve* srf_base_curve = curve->Duplicate(); + srf_base_curve->Translate(-mag * dir); + + ON_3dPoint sum_basepoint = ON_origin - l->PointAtStart(); sum_srf = new ON_SumSurface(); sum_srf->m_curve[0] = srf_base_curve; sum_srf->m_curve[1] = l; //srf_path_curve; Modified: brlcad/trunk/src/conv/step/PullbackCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-12-10 18:40:12 UTC (rev 36867) +++ brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-12-10 21:00:26 UTC (rev 36868) @@ -2017,10 +2017,18 @@ check_pullback_seam_bridge(const ON_Surface *surf, const ON_2dPoint &p1,const ON_2dPoint &p2) { if (is_closed(surf)) { int is,js; - if (((is=IsAtSeam(surf,p1.x,p1.y)) >= 0) && ((js=IsAtSeam(surf,p2.x,p2.y)) >= 0)) { + if (((is=IsAtSeam(surf,p1.x,p1.y)) > 0) && ((js=IsAtSeam(surf,p2.x,p2.y)) > 0)) { //create new seam trim if (is == js) { + // need to check if seam 3d points are equal + double endpoint_distance = p1.DistanceTo(p2); + double t0,t1; + + int dir = is - 1; + surf->GetDomain(dir,&t0,&t1); + if (endpoint_distance > 0.5*(t1-t0)) { return is; + } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-12-22 15:42:03
|
Revision: 36978 http://brlcad.svn.sourceforge.net/brlcad/?rev=36978&view=rev Author: brlcad Date: 2009-12-22 15:41:51 +0000 (Tue, 22 Dec 2009) Log Message: ----------- beginning of massive header and type inclusion cleanup. header inclusion ordering of c++ needs to be cleaned up. avoiding inclusion of std namespace. formatting/ws/indent cleanup. opening braces. work in progress with more on the way. Modified Paths: -------------- brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h brlcad/trunk/src/conv/step/BRLCADWrapper.cpp brlcad/trunk/src/conv/step/BRLCADWrapper.h brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp brlcad/trunk/src/conv/step/Representation.cpp brlcad/trunk/src/conv/step/Representation.h brlcad/trunk/src/conv/step/STEPEntity.cpp brlcad/trunk/src/conv/step/STEPEntity.h brlcad/trunk/src/conv/step/STEPWrapper.cpp brlcad/trunk/src/conv/step/STEPWrapper.h brlcad/trunk/src/conv/step/ShapeRepresentation.cpp brlcad/trunk/src/conv/step/ShapeRepresentation.h Modified: brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp =================================================================== --- brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp 2009-12-22 15:36:37 UTC (rev 36977) +++ brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp 2009-12-22 15:41:51 UTC (rev 36978) @@ -24,71 +24,84 @@ * */ +/* interface header */ +#include "./AdvancedBrepShapeRepresentation.h" + +/* implementation headers */ #include "STEPWrapper.h" #include "Factory.h" - -#include "AdvancedBrepShapeRepresentation.h" #include "ManifoldSolidBrep.h" #include "GeometricRepresentationContext.h" #define CLASSNAME "AdvancedBrepShapeRepresentation" #define ENTITYNAME "Advanced_Brep_Shape_Representation" -string AdvancedBrepShapeRepresentation::entityname = Factory::RegisterClass(ENTITYNAME,(FactoryMethod)AdvancedBrepShapeRepresentation::Create); + +std::string AdvancedBrepShapeRepresentation::entityname = Factory::RegisterClass(ENTITYNAME, (FactoryMethod)AdvancedBrepShapeRepresentation::Create); + + AdvancedBrepShapeRepresentation::AdvancedBrepShapeRepresentation() { - step = NULL; - id = 0; + step = NULL; + id = 0; } + AdvancedBrepShapeRepresentation::AdvancedBrepShapeRepresentation(STEPWrapper *sw, int STEPid) { - step = sw; - id = STEPid; + step = sw; + id = STEPid; } + AdvancedBrepShapeRepresentation::~AdvancedBrepShapeRepresentation() { } + STEPEntity * -AdvancedBrepShapeRepresentation::Create(STEPWrapper *sw,SCLP23(Application_instance) *sse){ - Factory::OBJECTS::iterator i; - if ((i = Factory::FindObject(sse->STEPfile_id)) == Factory::objects.end()) { - AdvancedBrepShapeRepresentation *object = new AdvancedBrepShapeRepresentation(sw,sse->STEPfile_id); +AdvancedBrepShapeRepresentation::Create(STEPWrapper *sw, SCLP23(Application_instance) *sse) { + Factory::OBJECTS::iterator i; + if ((i = Factory::FindObject(sse->STEPfile_id)) == Factory::objects.end()) { + AdvancedBrepShapeRepresentation *object = new AdvancedBrepShapeRepresentation(sw, sse->STEPfile_id); - Factory::AddObject(object); + Factory::AddObject(object); - if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; - delete object; - return NULL; - } - return static_cast<STEPEntity *>(object); - } else { - return (*i).second; + if (!object->Load(sw, sse)) { + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; + delete object; + return NULL; } + return static_cast<STEPEntity *>(object); + } else { + return (*i).second; + } } + bool AdvancedBrepShapeRepresentation::Load(STEPWrapper *sw, SCLP23(Application_instance) *sse) { - step=sw; - id = sse->STEPfile_id; + step = sw; + id = sse->STEPfile_id; - if ( !ShapeRepresentation::Load(step,sse) ) { - cerr << CLASSNAME << ":Error loading base class ::ShapeRepresentation." << endl; - return false; - } - return true; + if (!ShapeRepresentation::Load(step, sse)) { + std::cerr << CLASSNAME << ":Error loading base class ::ShapeRepresentation." << std::endl; + return false; + } + return true; } + void AdvancedBrepShapeRepresentation::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); + std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; - ShapeRepresentation::Print(level); + TAB(level); + std::cout << "Inherited Attributes:" << std::endl; + ShapeRepresentation::Print(level); } + // Local Variables: // tab-width: 8 // mode: C++ Modified: brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h =================================================================== --- brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h 2009-12-22 15:36:37 UTC (rev 36977) +++ brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h 2009-12-22 15:41:51 UTC (rev 36978) @@ -26,34 +26,44 @@ #ifndef ADVANCEDBREPSHAPEREPRESENTATION_H_ #define ADVANCEDBREPSHAPEREPRESENTATION_H_ +#include "common.h" + +/* system interface headers */ #include <list> +#include <string> +/* must come before step headers */ +#include "opennurbs.h" + +/* interface headers */ #include "ShapeRepresentation.h" +#include "sclprefixes.h" -class ON_Brep; -class AdvancedBrepShapeRepresentation : public ShapeRepresentation { -private: - static string entityname; +class AdvancedBrepShapeRepresentation : public ShapeRepresentation +{ + private: + static std::string entityname; -protected: + protected: -public: - AdvancedBrepShapeRepresentation(); - AdvancedBrepShapeRepresentation(STEPWrapper *sw, int STEPid); - virtual ~AdvancedBrepShapeRepresentation(); + public: + AdvancedBrepShapeRepresentation(); + AdvancedBrepShapeRepresentation(STEPWrapper *sw, int STEPid); + virtual ~AdvancedBrepShapeRepresentation(); - ON_Brep *GetONBrep(); - virtual bool LoadONBrep(ON_Brep *brep); + ON_Brep *GetONBrep(); + virtual bool LoadONBrep(ON_Brep *brep); - bool Load(STEPWrapper *sw, SCLP23(Application_instance) *sse); - string Name() {return name;}; - virtual void Print(int level); + bool Load(STEPWrapper *sw, SCLP23(Application_instance) *sse); + std::string Name() {return name;}; + virtual void Print(int level); - //static methods - static STEPEntity *Create(STEPWrapper *sw,SCLP23(Application_instance) *sse); + //static methods + static STEPEntity *Create(STEPWrapper *sw, SCLP23(Application_instance) *sse); }; + #endif /* ADVANCEDBREPSHAPEREPRESENTATION_H_ */ /* Modified: brlcad/trunk/src/conv/step/BRLCADWrapper.cpp =================================================================== --- brlcad/trunk/src/conv/step/BRLCADWrapper.cpp 2009-12-22 15:36:37 UTC (rev 36977) +++ brlcad/trunk/src/conv/step/BRLCADWrapper.cpp 2009-12-22 15:41:51 UTC (rev 36978) @@ -23,33 +23,33 @@ * */ +#include "common.h" + +/* interface header */ +#include "./BRLCADWrapper.h" + +/* system headers */ #include <sstream> -#include <string> #include <iostream> -using namespace std; -#include "BRLCADWrapper.h" - -extern "C" { -/* brlcad headers */ -#include <bu.h> -#include <wdb.h> -} int BRLCADWrapper::sol_reg_cnt=0; + BRLCADWrapper::BRLCADWrapper() { - outfp = NULL; + outfp = NULL; } + BRLCADWrapper::~BRLCADWrapper() { } + bool -BRLCADWrapper::OpenFile( const char *flnm ) { - //TODO: need to check to make sure we aren't overwriting +BRLCADWrapper::OpenFile(const char *flnm) { + //TODO: need to check to make sure we aren't overwriting - /* open brlcad instance */ + /* open brlcad instance */ if ((outfp = wdb_fopen(flnm)) == NULL) { bu_log("Cannot open output file (%s)\n", flnm); return false; @@ -62,6 +62,8 @@ return true; } + + bool BRLCADWrapper::WriteHeader() { db5_update_attribute("_GLOBAL", "HEADERINFO", "test header attributes", outfp->dbip); @@ -69,6 +71,8 @@ db5_update_attribute("_GLOBAL", "HEADERAPPROVED", "test header approval", outfp->dbip); return true; } + + bool BRLCADWrapper::WriteSphere(double *center, double radius) { center[X] = 0.0; @@ -78,28 +82,30 @@ return true; } + bool -BRLCADWrapper::WriteBrep(string name,ON_Brep *brep) { - ostringstream str; - string strcnt; +BRLCADWrapper::WriteBrep(std::string name, ON_Brep *brep) { + std::ostringstream str; + std::string strcnt; - if (name.empty()) { - name = filename; - } - //TODO: need to do some name checks here for now static - //region/solid number increment - str << sol_reg_cnt++; - strcnt = str.str(); - string sol = name + strcnt + ".s"; - string reg = name + strcnt + ".r"; + if (name.empty()) { + name = filename; + } + //TODO: need to do some name checks here for now static + //region/solid number increment + str << sol_reg_cnt++; + strcnt = str.str(); + std::string sol = name + strcnt + ".s"; + std::string reg = name + strcnt + ".r"; mk_brep(outfp, sol.c_str(), brep); - unsigned char rgb[] = {200,180,180}; + unsigned char rgb[] = {200, 180, 180}; mk_region1(outfp, reg.c_str(), sol.c_str(), "plastic", "", rgb); return true; } + bool BRLCADWrapper::Close() { @@ -108,6 +114,7 @@ return true; } + // Local Variables: // tab-width: 8 // mode: C++ Modified: brlcad/trunk/src/conv/step/BRLCADWrapper.h =================================================================== --- brlcad/trunk/src/conv/step/BRLCADWrapper.h 2009-12-22 15:36:37 UTC (rev 36977) +++ brlcad/trunk/src/conv/step/BRLCADWrapper.h 2009-12-22 15:41:51 UTC (rev 36978) @@ -26,24 +26,36 @@ #ifndef BRLCADWRAPPER_H_ #define BRLCADWRAPPER_H_ +#include "common.h" + +#include <string> + +extern "C" { +/* brlcad headers */ +#include <bu.h> +#include <wdb.h> +} + + class ON_Brep; class BRLCADWrapper { -private: - string filename; - struct rt_wdb *outfp; - static int sol_reg_cnt; + private: + std::string filename; + struct rt_wdb *outfp; + static int sol_reg_cnt; -public: - BRLCADWrapper(); - virtual ~BRLCADWrapper(); - bool OpenFile( const char * flnm); - bool WriteHeader(); - bool WriteSphere(double *center, double radius); - bool WriteBrep(string name,ON_Brep *brep); - bool Close(); + public: + BRLCADWrapper(); + virtual ~BRLCADWrapper(); + bool OpenFile(const char *filename); + bool WriteHeader(); + bool WriteSphere(double *center, double radius); + bool WriteBrep(std::string name, ON_Brep *brep); + bool Close(); }; + #endif /* BRLCADWRAPPER_H_ */ /* Modified: brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp =================================================================== --- brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2009-12-22 15:36:37 UTC (rev 36977) +++ brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2009-12-22 15:41:51 UTC (rev 36978) @@ -95,7 +95,6 @@ #include "AdvancedBrepShapeRepresentation.h" #include "PullbackCurve.h" -using namespace brlcad; ON_Brep * AdvancedBrepShapeRepresentation::GetONBrep() @@ -103,7 +102,7 @@ ON_Brep *brep = ON_Brep::New(); if (!LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::GetONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::GetONBrep() - Error loading openNURBS brep." << std::endl; //still return brep may contain something useful to diagnose return brep; } @@ -111,6 +110,7 @@ return brep; } + bool AdvancedBrepShapeRepresentation::LoadONBrep(ON_Brep *brep) { @@ -118,7 +118,7 @@ for (i = items.begin(); i != items.end(); i++) { if (!(*i)->LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } } @@ -126,16 +126,18 @@ return true; } + // // Curve handlers // bool BezierCurve::LoadONBrep(ON_Brep *brep) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; return false; } + bool BSplineCurve::LoadONBrep(ON_Brep *brep) { @@ -146,7 +148,7 @@ ON_NurbsCurve* curve = ON_NurbsCurve::New(3, false, degree + 1, t_size); - // knot index ( >= 0 and < Order + CV_count - 2 ) + // knot index (>= 0 and < Order + CV_count - 2) // generate u-knots int n = t_size; int p = degree; @@ -174,6 +176,7 @@ return true; } + bool BSplineCurveWithKnots::LoadONBrep(ON_Brep *brep) { @@ -213,7 +216,7 @@ m++; } } else { - // knot index ( >= 0 and < Order + CV_count - 2 ) + // knot index (>= 0 and < Order + CV_count - 2) LIST_OF_INTEGERS::iterator m = knot_multiplicities.begin(); LIST_OF_REALS::iterator r = knots.begin(); int knot_index = 0; @@ -243,6 +246,7 @@ return true; } + bool QuasiUniformCurve::LoadONBrep(ON_Brep *brep) { @@ -250,19 +254,21 @@ return true; if (!BSplineCurve::LoadONBrep(brep)) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; return false; } return true; } + bool RationalBezierCurve::LoadONBrep(ON_Brep *brep) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; return false; } + bool RationalBSplineCurve::LoadONBrep(ON_Brep *brep) { @@ -273,7 +279,7 @@ ON_NurbsCurve* curve = ON_NurbsCurve::New(3, true, degree + 1, t_size); - // knot index ( >= 0 and < Order + CV_count - 2 ) + // knot index (>= 0 and < Order + CV_count - 2) // generate u-knots int n = t_size; int p = degree; @@ -305,6 +311,7 @@ return true; } + bool RationalBSplineCurveWithKnots::LoadONBrep(ON_Brep *brep) { @@ -375,6 +382,7 @@ return true; } + bool RationalQuasiUniformCurve::LoadONBrep(ON_Brep *brep) { @@ -382,12 +390,13 @@ return true; if (!RationalBSplineCurve::LoadONBrep(brep)) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; return false; } return true; } + bool RationalUniformCurve::LoadONBrep(ON_Brep *brep) { @@ -395,12 +404,13 @@ return true; if (!RationalBSplineCurve::LoadONBrep(brep)) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; return false; } return true; } + bool UniformCurve::LoadONBrep(ON_Brep *brep) { @@ -408,12 +418,13 @@ return true; if (!BSplineCurve::LoadONBrep(brep)) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; return false; } return true; } + // // Surface handlers // @@ -421,11 +432,12 @@ BezierSurface::LoadONBrep(ON_Brep *brep) { //TODO: add bezier surface - //ON_BezierSurface* surf = ON_BezierSurface::New( 3, false,u_degree+1,v_degree+1); - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + //ON_BezierSurface* surf = ON_BezierSurface::New(3, false, u_degree+1, v_degree+1); + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << std::endl; return false; } + bool BSplineSurface::LoadONBrep(ON_Brep *brep) { @@ -434,7 +446,7 @@ ON_NurbsSurface* surf = ON_NurbsSurface::New(3, false, u_degree + 1, v_degree + 1, u_size, v_size); - // knot index ( >= 0 and < Order + CV_count - 2 ) + // knot index (>= 0 and < Order + CV_count - 2) // generate u-knots int n = u_size; int p = u_degree; @@ -483,6 +495,7 @@ return true; } + bool BSplineSurfaceWithKnots::LoadONBrep(ON_Brep *brep) { @@ -602,24 +615,27 @@ return true; } + bool QuasiUniformSurface::LoadONBrep(ON_Brep *brep) { if (!BSplineSurface::LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } return true; } + bool RationalBezierSurface::LoadONBrep(ON_Brep *brep) { //TODO: add rational bezier surface - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << std::endl; return false; } + bool RationalBSplineSurface::LoadONBrep(ON_Brep *brep) { @@ -628,7 +644,7 @@ ON_NurbsSurface* surf = ON_NurbsSurface::New(3, false, u_degree + 1, v_degree + 1, u_size, v_size); - // knot index ( >= 0 and < Order + CV_count - 2 ) + // knot index (>= 0 and < Order + CV_count - 2) // generate u-knots int n = u_size; int p = u_degree; @@ -681,6 +697,7 @@ return true; } + bool RationalBSplineSurfaceWithKnots::LoadONBrep(ON_Brep *brep) { @@ -696,7 +713,7 @@ ON_NurbsSurface* surf = ON_NurbsSurface::New(3, true, u_degree + 1, v_degree + 1, u_size, v_size); - // knot index ( >= 0 and < Order + CV_count - 2 ) + // knot index (>= 0 and < Order + CV_count - 2) LIST_OF_INTEGERS::iterator m = u_multiplicities.begin(); LIST_OF_REALS::iterator r = u_knots.begin(); int knot_index = 0; @@ -747,31 +764,34 @@ return true; } + bool RationalQuasiUniformSurface::LoadONBrep(ON_Brep *brep) { if (!RationalBSplineSurface::LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } return true; } + bool RationalUniformSurface::LoadONBrep(ON_Brep *brep) { if (!RationalBSplineSurface::LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } return true; } + bool UniformSurface::LoadONBrep(ON_Brep *brep) { if (!BSplineSurface::LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } return true; @@ -790,12 +810,13 @@ ON_id = face.m_face_index; } + bool FaceSurface::LoadONBrep(ON_Brep *brep) { //TODO: remove debugging code if ((false) && (brep->m_F.Count() == 84)) { - cerr << "Debug:LoadONBrep for FaceSurface:" << brep->m_F.Count() << endl; + std::cerr << "Debug:LoadONBrep for FaceSurface:" << brep->m_F.Count() << std::endl; } // need edge bounds to determine extents for some of the infinitely // defined surfaces like cones/cylinders/planes @@ -803,7 +824,7 @@ face_geometry->SetCurveBounds(bb); if (!face_geometry->LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } @@ -811,22 +832,24 @@ //TODO: remove debugging code if ((false) && (ON_id == 72)) { - cerr << "Debug:LoadONBrep for FaceSurface:" << ON_id << endl; + std::cerr << "Debug:LoadONBrep for FaceSurface:" << ON_id << std::endl; } if (!Face::LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } return true; } + void Point::AddVertex(ON_Brep *brep) { - cerr << "Warning: " << entityname << "::AddVertex() should be overridden by parent class." << endl; + std::cerr << "Warning: " << entityname << "::AddVertex() should be overridden by parent class." << std::endl; } + void CartesianPoint::AddVertex(ON_Brep *brep) { @@ -839,6 +862,7 @@ } } + void BSplineCurve::AddPolyLine(ON_Brep *brep) { @@ -858,17 +882,19 @@ } else if (num_control_points > 2) { ON_NurbsCurve* c = ON_NurbsCurve::New(3, false, degree + 1, num_control_points); } else { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading polyLine." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading polyLine." << std::endl; } } } + void VertexPoint::AddVertex(ON_Brep *brep) { vertex_geometry->AddVertex(brep); } + ON_BoundingBox * Face::GetEdgeBounds(ON_Brep *brep) { @@ -886,6 +912,7 @@ return u; } + bool Face::LoadONBrep(ON_Brep *brep) { @@ -897,7 +924,7 @@ for (i = bounds.rbegin(); i != bounds.rend(); i++) { (*i)->SetFaceIndex(ON_id); if (!(*i)->LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } ON_BrepFace& face = brep->m_F[GetONId()]; @@ -906,24 +933,27 @@ return true; } + bool FaceOuterBound::LoadONBrep(ON_Brep *brep) { SetOuter(); if (!FaceBound::LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } return true; } + ON_BoundingBox * FaceBound::GetEdgeBounds(ON_Brep *brep) { return bound->GetEdgeBounds(brep); } + bool FaceBound::LoadONBrep(ON_Brep *brep) { @@ -939,32 +969,33 @@ } bound->SetLoopIndex(ON_id); if (!bound->LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } if (!Oriented()) { ON_BrepLoop& loop = brep->m_L[ON_id]; brep->FlipLoop(loop); } -/* lets use the cues from STEP (Oriented) for now but leave this here - * in case we have to go back to brute force +/* lets use the cues from STEP (Oriented) for now but leave this here + * in case we have to go back to brute force - if (IsInner()) { - ON_BrepLoop& loop = brep->m_L[ON_id]; - if (brep->LoopDirection((const ON_BrepLoop&) loop) > 0) { - brep->FlipLoop(loop); - } - } else { - ON_BrepLoop& loop = brep->m_L[ON_id]; - if (brep->LoopDirection((const ON_BrepLoop&) loop) < 0) { - brep->FlipLoop(loop); - } - } + if (IsInner()) { + ON_BrepLoop& loop = brep->m_L[ON_id]; + if (brep->LoopDirection((const ON_BrepLoop&) loop) > 0) { + brep->FlipLoop(loop); + } + } else { + ON_BrepLoop& loop = brep->m_L[ON_id]; + if (brep->LoopDirection((const ON_BrepLoop&) loop) < 0) { + brep->FlipLoop(loop); + } + } */ return true; } + bool EdgeCurve::LoadONBrep(ON_Brep *brep) { @@ -972,13 +1003,13 @@ return true; // already loaded if ((false) && (brep->m_E.Count() == 484)) { - cerr << "Debug:LoadONBrep for EdgeCurve:" << brep->m_E.Count() << endl; + std::cerr << "Debug:LoadONBrep for EdgeCurve:" << brep->m_E.Count() << std::endl; } edge_geometry->Start(edge_start); edge_geometry->End(edge_end); if (!edge_geometry->LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } @@ -994,6 +1025,7 @@ return true; } + bool OrientedEdge::LoadONBrep(ON_Brep *brep) { @@ -1001,19 +1033,19 @@ return true; //already loaded if ((false) && (brep->m_E.Count() == 5)) { - cerr << "Debug:LoadONBrep for OrientedEdge:" << brep->m_E.Count() << endl; + std::cerr << "Debug:LoadONBrep for OrientedEdge:" << brep->m_E.Count() << std::endl; } if (!edge_start->LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } if (!edge_end->LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } if (!edge_element->LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } @@ -1021,11 +1053,12 @@ //TODO: remove debugging code if ((false) && (ON_id == 31)) { - cerr << "Debug:LoadONBrep for OrientedEdge:" << ON_id << endl; + std::cerr << "Debug:LoadONBrep for OrientedEdge:" << ON_id << std::endl; } return true; } + ON_BoundingBox * Path::GetEdgeBounds(ON_Brep *brep) { @@ -1033,7 +1066,7 @@ LIST_OF_ORIENTED_EDGES::iterator i; for (i = edge_list.begin(); i != edge_list.end(); i++) { if (!(*i)->LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } if (u == NULL) @@ -1046,6 +1079,7 @@ return u; } + bool Path::LoadONBrep(ON_Brep *brep) { @@ -1054,13 +1088,13 @@ for (i = edge_list.begin(); i != edge_list.end(); i++) { if (!(*i)->LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } } //TODO: remove debugging code if ((false) && (id == 26089)) { - cerr << "Debug:LoadONBrep for Path:" << id << endl; + std::cerr << "Debug:LoadONBrep for Path:" << id << std::endl; } if (!LoadONTrimmingCurves(brep)) { return false; @@ -1069,6 +1103,7 @@ return true; } + bool Path::ShiftSurfaceSeam(ON_Brep *brep, double *t) { @@ -1087,7 +1122,7 @@ LIST_OF_ORIENTED_EDGES::iterator i; for (i = edge_list.begin(); i != edge_list.end(); i++) { - // grab the curve for this edge,face and surface + // grab the curve for this edge, face and surface const ON_BrepEdge* edge = &brep->m_E[(*i)->GetONId()]; const ON_Curve* curve = edge->EdgeCurveOf(); double tmin, tmax; @@ -1108,6 +1143,7 @@ return false; } + bool Path::LoadONTrimmingCurves(ON_Brep *brep) { @@ -1125,19 +1161,19 @@ //TODO: remove debugging code if ((false) && (id == 24894)) { - cerr << "Debug:LoadONTrimmingCurves for Path:" << id << endl; + std::cerr << "Debug:LoadONTrimmingCurves for Path:" << id << std::endl; } PBCData *data = NULL; LIST_OF_ORIENTED_EDGES::iterator prev, next; for (i = edge_list.begin(); i != edge_list.end(); i++) { - // grab the curve for this edge,face and surface + // grab the curve for this edge, face and surface const ON_BrepEdge* edge = &brep->m_E[(*i)->GetONId()]; const ON_Curve* curve = edge->EdgeCurveOf(); ON_BoundingBox bb = curve->BoundingBox(); bool orientWithCurve = (*i)->OrientWithEdge(); if ((true) && (id == 34193)) { - cerr << "Debug:LoadONTrimmingCurves for Path:" << id << endl; + std::cerr << "Debug:LoadONTrimmingCurves for Path:" << id << std::endl; } data = pullback_samples(st, curve); if (data == NULL) @@ -1172,7 +1208,7 @@ } // check for seams and singularities if (!check_pullback_data(curve_pullback_samples)) { - cerr << "Error: Can not resolve seam or singularity issues." << endl; + std::cerr << "Error: Can not resolve seam or singularity issues." << std::endl; } list<PBCData *>::iterator cs = curve_pullback_samples.begin(); list<PBCData *>::iterator next_cs; @@ -1209,7 +1245,7 @@ int trimCurve = brep->m_C2.Count(); //TODO: remove debugging code if ((false) && (trimCurve == 68)) { - cerr << "Debug:LoadONTrimmingCurves for Path:" << trimCurve << endl; + std::cerr << "Debug:LoadONTrimmingCurves for Path:" << trimCurve << std::endl; } ON_Curve* c2d = interpolateCurve(*samples); brep->m_C2.Append(c2d); @@ -1225,15 +1261,15 @@ if (false) { ON_NurbsCurve nurbs_curve; c2d->GetNurbForm(nurbs_curve); - cerr << "Num_knots - " << nurbs_curve.KnotCount() << endl; - cerr << "CV count - " << nurbs_curve.CVCount() << endl; + std::cerr << "Num_knots - " << nurbs_curve.KnotCount() << std::endl; + std::cerr << "CV count - " << nurbs_curve.CVCount() << std::endl; for (int i = 0; i < nurbs_curve.KnotCount(); i++) { - cerr << "Knot[" << i << "] - " << nurbs_curve.Knot(i) << endl; + std::cerr << "Knot[" << i << "] - " << nurbs_curve.Knot(i) << std::endl; } for (int i = 0; i < nurbs_curve.CVCount(); i++) { ON_3dPoint p; nurbs_curve.GetCV(i, p); - cerr << "CV[" << i << "] - " << p.x << "," << p.y << endl; + std::cerr << "CV[" << i << "] - " << p.x << ", " << p.y << std::endl; } } } @@ -1254,21 +1290,21 @@ // 0 = south, 1 = east, 2 = north, 3 = west ON_Surface::ISO iso; switch (is) { - case 0: - //south - iso = ON_Surface::S_iso; - break; - case 1: - //east - iso = ON_Surface::E_iso; - break; - case 2: - //north - iso = ON_Surface::N_iso; - break; - case 3: - //west - iso = ON_Surface::W_iso; + case 0: + //south + iso = ON_Surface::S_iso; + break; + case 1: + //east + iso = ON_Surface::E_iso; + break; + case 2: + //north + iso = ON_Surface::N_iso; + break; + case 3: + //west + iso = ON_Surface::W_iso; } ON_Curve* c2d = new ON_LineCurve(end_current, start_next); @@ -1291,59 +1327,59 @@ //trim.Reverse(); trim.IsValid(&tl); } /*else if ((is = check_pullback_seam_bridge(surf, end_current, start_next)) >= 0) { - // insert trim - // insert singular trim along - // 0 = south, 1 = east, 2 = north, 3 = west - ON_Surface::ISO iso; - switch (is) { - case 0: - //south - iso = ON_Surface::S_iso; - break; - case 1: - //east - iso = ON_Surface::E_iso; - break; - case 2: - //north - iso = ON_Surface::N_iso; - break; - case 3: - //west - iso = ON_Surface::W_iso; - } + // insert trim + // insert singular trim along + // 0 = south, 1 = east, 2 = north, 3 = west + ON_Surface::ISO iso; + switch (is) { + case 0: + //south + iso = ON_Surface::S_iso; + break; + case 1: + //east + iso = ON_Surface::E_iso; + break; + case 2: + //north + iso = ON_Surface::N_iso; + break; + case 3: + //west + iso = ON_Surface::W_iso; + } - ON_Curve* c2d = new ON_LineCurve(end_current, start_next); - trimCurve = brep->m_C2.Count(); - brep->m_C2.Append(c2d); + ON_Curve* c2d = new ON_LineCurve(end_current, start_next); + trimCurve = brep->m_C2.Count(); + brep->m_C2.Append(c2d); - int vi; - int vo; - if (data->order_reversed) { - vi = data->edge->m_vi[0]; - vo = data->edge->m_vi[1]; - } else { - vi = data->edge->m_vi[1]; - vo = data->edge->m_vi[0]; - } -#ifdef TREATASBOUNDARY - ON_BrepEdge& e = (ON_BrepEdge&)*data->edge; - ON_BrepTrim& trim = brep->NewTrim(e, false, (ON_BrepLoop&) *loop, trimCurve); + int vi; + int vo; + if (data->order_reversed) { + vi = data->edge->m_vi[0]; + vo = data->edge->m_vi[1]; + } else { + vi = data->edge->m_vi[1]; + vo = data->edge->m_vi[0]; + } + #ifdef TREATASBOUNDARY + ON_BrepEdge& e = (ON_BrepEdge&)*data->edge; + ON_BrepTrim& trim = brep->NewTrim(e, false, (ON_BrepLoop&) *loop, trimCurve); - trim.m_type = ON_BrepTrim::boundary; - trim.m_tolerance[0] = 1e-3; //TODO: need constant tolerance? - trim.m_tolerance[1] = 1e-3; -#else - ON_BrepTrim& trim = brep->NewSingularTrim(brep->m_V[vi], (ON_BrepLoop&) *loop, iso, trimCurve); + trim.m_type = ON_BrepTrim::boundary; + trim.m_tolerance[0] = 1e-3; //TODO: need constant tolerance? + trim.m_tolerance[1] = 1e-3; + #else + ON_BrepTrim& trim = brep->NewSingularTrim(brep->m_V[vi], (ON_BrepLoop&) *loop, iso, trimCurve); - trim.m_tolerance[0] = 1e-3; //TODO: need constant tolerance? - trim.m_tolerance[1] = 1e-3; - ON_Interval PD = trim.ProxyCurveDomain(); - trim.m_iso = surf->IsIsoparametric(*brep->m_C2[trimCurve], &PD); - trim.m_iso = iso; -#endif - trim.IsValid(&tl); - }*/ + trim.m_tolerance[0] = 1e-3; //TODO: need constant tolerance? + trim.m_tolerance[1] = 1e-3; + ON_Interval PD = trim.ProxyCurveDomain(); + trim.m_iso = surf->IsIsoparametric(*brep->m_C2[trimCurve], &PD); + trim.m_iso = iso; + #endif + trim.IsValid(&tl); + }*/ } si++; } @@ -1353,6 +1389,7 @@ return true; } + bool Plane::LoadONBrep(ON_Brep *brep) { @@ -1374,7 +1411,7 @@ // origin may not lie within face so include in extent double maxdist = origin.DistanceTo(trim_curve_3d_bbox->m_max); double mindist = origin.DistanceTo(trim_curve_3d_bbox->m_min); - bbdiag += MAX(maxdist,mindist); + bbdiag += MAX(maxdist, mindist); //TODO: look into line curves that are just point and direction ON_Interval extents(-bbdiag, bbdiag); @@ -1388,6 +1425,7 @@ return true; } + bool CylindricalSurface::LoadONBrep(ON_Brep *brep) { @@ -1396,7 +1434,7 @@ // return true; // already loaded if ((false) && (brep->m_S.Count() == 56)) { - cerr << "LoadONBrep for CylindricalSurface: " << 55 << endl; + std::cerr << "LoadONBrep for CylindricalSurface: " << 55 << std::endl; } ON_3dPoint origin = GetOrigin(); ON_3dVector norm = GetNormal(); @@ -1416,7 +1454,7 @@ // with given center and radius. ON_Circle c(p, origin, radius * LocalUnits::length); - //ON_Cylinder cyl(c,ON_DBL_MAX); + //ON_Cylinder cyl(c, ON_DBL_MAX); ON_Cylinder cyl(c, 2.0 * bbdiag); ON_RevSurface* s = cyl.RevSurfaceForm(); @@ -1431,6 +1469,7 @@ return true; } + bool ConicalSurface::LoadONBrep(ON_Brep *brep) { @@ -1466,6 +1505,7 @@ return true; } + int intersectLines(ON_Line &l1, ON_Line &l2, ON_3dPoint &out) { @@ -1480,23 +1520,24 @@ tol.perp = 1e-6; tol.para = 1 - tol.perp; - VMOVE(p,l1.from); - VMOVE(a,l2.from); + VMOVE(p, l1.from); + VMOVE(a, l2.from); ON_3dVector l1dir = l1.Direction(); l1dir.Unitize(); - VMOVE(d,l1dir); + VMOVE(d, l1dir); ON_3dVector l2dir = l2.Direction(); l2dir.Unitize(); - VMOVE(c,l2dir); + VMOVE(c, l2dir); int i = bn_isect_line3_line3(&t, &u, p, d, a, c, &tol); if (i == 1) { - VMOVE(out,l1.from); + VMOVE(out, l1.from); out = out + t * l1dir; } return i; } + void Circle::SetParameterTrim(double start, double end) { @@ -1536,6 +1577,7 @@ SetPointTrim(startpoint, endpoint); } + bool Circle::LoadONBrep(ON_Brep *brep) { @@ -1544,7 +1586,7 @@ //if (ON_id >= 0) // return true; // already loaded if ((false) && ((brep->m_C3.Count() == 3) || (id == 1723))) { - cerr << "Debug:LoadONBrep for Circle:ID:" << id << endl; + std::cerr << "Debug:LoadONBrep for Circle:ID:" << id << std::endl; } ON_3dPoint origin = GetOrigin(); @@ -1568,7 +1610,7 @@ pnt1 = pnt1 * LocalUnits::length; pnt2 = pnt2 * LocalUnits::length; } else { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << std::endl; return false; } @@ -1583,20 +1625,20 @@ ON_3dPoint PX; double xdot = xaxis * v0; double ydot = yaxis * v0; - double t = atan2(ydot,xdot); + double t = atan2(ydot, xdot); xdot = xaxis * v2; ydot = yaxis * v2; - double s = atan2(ydot,xdot); + double s = atan2(ydot, xdot); - if ( s < t ) + if (s < t) s = s + 2.0*ON_PI; double theta = s - t; int narcs = 1; - if ( theta < ON_PI/2.0) { + if (theta < ON_PI/2.0) { narcs = 1; } else if (theta < ON_PI) { narcs = 2; @@ -1610,8 +1652,8 @@ ON_3dPointArray cpts(2*narcs + 1); double angle = t; double W[2*narcs + 1]; - ON_3dPoint P0,P1,P2,PM,PT; - ON_3dVector T0,T2; + ON_3dPoint P0, P1, P2, PM, PT; + ON_3dVector T0, T2; P0 = PB; T0 = -sin(t)*xaxis + cos(t)*yaxis; @@ -1623,15 +1665,15 @@ T2 = -sin(angle)*xaxis + cos(angle)*yaxis; ON_Line tangent1(P0, P0 + r * T0); ON_Line tangent2(P2, P2 + r * T2); - if (intersectLines(tangent1, tangent2, P1) != 1) { - cerr << entityname << ": Error: Control point can not be calculated." << endl; - return false; - } + if (intersectLines(tangent1, tangent2, P1) != 1) { + std::cerr << entityname << ": Error: Control point can not be calculated." << std::endl; + return false; + } - P1 = (w) * P1; // must pre-weight before putting into NURB - cpts.Append(P0); + P1 = (w) * P1; // must pre-weight before putting into NURB + cpts.Append(P0); W[2*i] = 1.0; - cpts.Append(P1); + cpts.Append(P1); W[2*i + 1] = w; P0 = P2; @@ -1670,7 +1712,7 @@ for (int i = 0; i < n; i++) { ON_3dPoint p = cpts[i]; c->SetCV(i, p); - c->SetWeight(i,W[i]); + c->SetWeight(i, W[i]); } ON_id = brep->AddEdgeCurve(c); @@ -1678,6 +1720,7 @@ return true; } + void Ellipse::SetParameterTrim(double start, double end) { @@ -1722,6 +1765,7 @@ SetPointTrim(startpoint, endpoint); } + bool Ellipse::LoadONBrep(ON_Brep *brep) { @@ -1759,7 +1803,7 @@ } //TODO: check sense agreement } else { - //must be point trim so calc t,s from points + //must be point trim so calc t, s from points pnt1 = trim_startpoint; pnt2 = trim_endpoint; // NOTE: point from point trim entity already converted to proper units @@ -1803,7 +1847,7 @@ t = tmp; } } else { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << std::endl; return false; } double yt = b * sin(t); @@ -1849,7 +1893,7 @@ ON_3dPoint P1; if (intersectLines(tangent1, tangent2, P1) != 1) { - cerr << entityname << ": Error: Control point can not be calculated." << endl; + std::cerr << entityname << ": Error: Control point can not be calculated." << std::endl; return false; } @@ -1857,7 +1901,7 @@ ON_Line l2(P0, P2); ON_3dPoint PM; if (intersectLines(l1, l2, PM) != 1) { - cerr << entityname << ": Error: Control point can not be calculated." << endl; + std::cerr << entityname << ": Error: Control point can not be calculated." << std::endl; return false; } @@ -1888,6 +1932,7 @@ return true; } + void Hyperbola::SetParameterTrim(double start, double end) { @@ -1937,6 +1982,7 @@ SetPointTrim(startpoint, endpoint); } + bool Hyperbola::LoadONBrep(ON_Brep *brep) { @@ -1967,20 +2013,20 @@ ON_3dPoint pnt1; ON_3dPoint pnt2; if (trimmed) { //explicitly trimmed - pnt1 = trim_startpoint; - pnt2 = trim_endpoint; + pnt1 = trim_startpoint; + pnt2 = trim_endpoint; } else if ((start != NULL) && (end != NULL)) { pnt1 = start->Point3d(); pnt2 = end->Point3d(); } else { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << std::endl; return false; } ON_3dPoint P0 = pnt1 * LocalUnits::length; ON_3dPoint P2 = pnt2 * LocalUnits::length; - // calc tangent P0,P2 intersection + // calc tangent P0, P2 intersection ON_3dVector ToFocus = focus - P0; ToFocus.Unitize(); @@ -2004,7 +2050,7 @@ ON_Line bs2(P2, P2 + bisector); ON_3dPoint P1; if (intersectLines(bs0, bs2, P1) != 1) { - cerr << entityname << ": Error: Control point can not be calculated." << endl; + std::cerr << entityname << ": Error: Control point can not be calculated." << std::endl; return false; } @@ -2049,6 +2095,7 @@ return true; } + void Parabola::SetParameterTrim(double start, double end) { @@ -2097,6 +2144,7 @@ SetPointTrim(startpoint, endpoint); } + bool Parabola::LoadONBrep(ON_Brep *brep) { @@ -2120,13 +2168,13 @@ ON_3dPoint pnt1; ON_3dPoint pnt2; if (trimmed) { //explicitly trimmed - pnt1 = trim_startpoint; - pnt2 = trim_endpoint; + pnt1 = trim_startpoint; + pnt2 = trim_endpoint; } else if ((start != NULL) && (end != NULL)) { //not explicit let's try edge vertices pnt1 = start->Point3d(); pnt2 = end->Point3d(); } else { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << std::endl; return false; } @@ -2150,7 +2198,7 @@ ON_3dPoint P1; if (intersectLines(tangent1, tangent2, P1) != 1) { - cerr << entityname << ": Error: Control point can not be calculated." << endl; + std::cerr << entityname << ": Error: Control point can not be calculated." << std::endl; return false; } @@ -2170,6 +2218,7 @@ return true; } + bool Line::LoadONBrep(ON_Brep *brep) { @@ -2189,6 +2238,7 @@ return true; } + bool SurfaceOfLinearExtrusion::LoadONBrep(ON_Brep *brep) { @@ -2199,7 +2249,7 @@ // load parent class if (!SweptSurface::LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } @@ -2221,7 +2271,7 @@ startpnt = curve->PointAtStart(); } else { startpnt = swept_curve->PointAtStart(); - startpnt = startpnt * LocalUnits::length; + startpnt = startpnt * LocalUnits::length; } // add a little buffer in the surface extrusion distance @@ -2259,6 +2309,7 @@ return true; } + bool SurfaceOfRevolution::LoadONBrep(ON_Brep *brep) { @@ -2269,7 +2320,7 @@ // load parent class if (!SweptSurface::LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } @@ -2283,7 +2334,7 @@ revsurf->m_axis = axisline; revsurf->BoundingBox(); // fills in sum_srf->m_bbox - //ON_Brep* b = ON_BrepRevSurface( revsurf, true, true); + //ON_Brep* b = ON_BrepRevSurface(revsurf, true, true); if (!revsurf) return false; @@ -2293,6 +2344,7 @@ return true; } + bool SphericalSurface::LoadONBrep(ON_Brep *brep) { @@ -2317,6 +2369,7 @@ return true; } + bool ToroidalSurface::LoadONBrep(ON_Brep *brep) { @@ -2351,6 +2404,7 @@ return true; } + bool VertexLoop::LoadONBrep(ON_Brep *brep) { @@ -2374,27 +2428,27 @@ ON_2dPoint start, end; ON_Surface::ISO iso; - if (VAPPROXEQUAL(vertex,corner[0],POINT_CLOSENESS_TOLERANCE)) { + if (VAPPROXEQUAL(vertex, corner[0], POINT_CLOSENESS_TOLERANCE)) { start = ON_2dPoint(U.m_t[0], V.m_t[0]); - if (VAPPROXEQUAL(vertex,corner[1],POINT_CLOSENESS_TOLERANCE)) { + if (VAPPROXEQUAL(vertex, corner[1], POINT_CLOSENESS_TOLERANCE)) { //south; end = ON_2dPoint(U.m_t[1], V.m_t[0]); iso = ON_Surface::S_iso; - } else if (VAPPROXEQUAL(vertex,corner[2],POINT_CLOSENESS_TOLERANCE)) { + } else if (VAPPROXEQUAL(vertex, corner[2], POINT_CLOSENESS_TOLERANCE)) { //west end = ON_2dPoint(U.m_t[0], V.m_t[1]); iso = ON_Surface::W_iso; } - } else if (VAPPROXEQUAL(vertex,corner[1],POINT_CLOSENESS_TOLERANCE)) { + } else if (VAPPROXEQUAL(vertex, corner[1], POINT_CLOSENESS_TOLERANCE)) { start = ON_2dPoint(U.m_t[1], V.m_t[0]); - if (VAPPROXEQUAL(vertex,corner[3],POINT_CLOSENESS_TOLERANCE)) { + if (VAPPROXEQUAL(vertex, corner[3], POINT_CLOSENESS_TOLERANCE)) { //east end = ON_2dPoint(U.m_t[1], V.m_t[1]); iso = ON_Surface::E_iso; } - } else if (VAPPROXEQUAL(vertex,corner[2],POINT_CLOSENESS_TOLERANCE)) { + } else if (VAPPROXEQUAL(vertex, corner[2], POINT_CLOSENESS_TOLERANCE)) { start = ON_2dPoint(U.m_t[0], V.m_t[1]); - if (VAPPROXEQUAL(vertex,corner[3],POINT_CLOSENESS_TOLERANCE)) { + if (VAPPROXEQUAL(vertex, corner[3], POINT_CLOSENESS_TOLERANCE)) { //north end = ON_2dPoint(U.m_t[1], V.m_t[1]); iso = ON_Surface::N_iso; @@ -2409,6 +2463,7 @@ return true; } + // Local Variables: // tab-width: 8 // mode: C++ Modified: brlcad/trunk/src/conv/step/Representation.cpp =================================================================== --- brlcad/trunk/src/conv/step/Representation.cpp 2009-12-22 15:36:37 UTC (rev 36977) +++ brlcad/trunk/src/conv/step/Representation.cpp 2009-12-22 15:41:51 UTC (rev 36978) @@ -24,315 +24,330 @@ * */ +/* interface header */ +#include "./Representation.h" + +/* implemenation headers */ #include "STEPWrapper.h" #include "Factory.h" -#include "Representation.h" #include "ManifoldSolidBrep.h" #include "GeometricRepresentationContext.h" #include "GlobalUncertaintyAssignedContext.h" #include "GlobalUnitAssignedContext.h" #include "ParametricRepresentationContext.h" + #define BUFSIZE 255 // used for buffer size that stringifies step ID #define CLASSNAME "Representation" #define ENTITYNAME "Representation" -string Representation::entityname = Factory::RegisterClass(ENTITYNAME,(FactoryMethod)Representation::Create); +string Representation::entityname = Factory::RegisterClass(ENTITYNAME, (FactoryMethod)Representation::Create); + + Representation::Representation() { - step = NULL; - id = 0; + step = NULL; + id = 0; } + Representation::Representation(STEPWrapper *sw, int STEPid) { - step = sw; - id = STEPid; + step = sw; + id = STEPid; } + Representation::~Representation() { - /* - LIST_OF_REPRESENTATION_ITEMS::iterator i = items.begin(); + /* + LIST_OF_REPRESENTATION_ITEMS::iterator i = items.begin(); - while(i != items.end()) { - delete (*i); - i = items.erase(i); - } + while (i != items.end()) { + delete (*i); + i = items.erase(i); + } + LIST_OF_REPRESENTATION_CONTEXT::iterator ic = context_of_items.begin(); + + while (ic != context_of_items.end()) { + delete (*ic); + ic = context_of_items.erase(ic); + } + */ + items.clear(); + if (context_of_items.size() > 1) { LIST_OF_REPRESENTATION_CONTEXT::iterator ic = context_of_items.begin(); - while(ic != context_of_items.end()) { - delete (*ic); - ic = context_of_items.erase(ic); + while (ic != context_of_items.end()) { + delete (*ic); + ic = context_of_items.erase(ic); } - */ - items.clear(); - if (context_of_items.size() > 1) { - LIST_OF_REPRESENTATION_CONTEXT::iterator ic = context_of_items.begin(); - - while(ic != context_of_items.end()) { - delete (*ic); - ic = context_of_items.erase(ic); - } - } else { - context_of_items.clear(); - } + } else { + context_of_items.clear(); + } } + double Representation::GetLengthConversionFactor() { - LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); + LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); - while (i != context_of_items.end()) { - GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); - if (aGUAC != NULL) { - return aGUAC->GetLengthConversionFactor(); - } - i++; + while (i != context_of_items.end()) { + GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); + if (aGUAC != NULL) { + return aGUAC->GetLengthConversionFactor(); } - return 1000.0; // assume base of meters + i++; + } + return 1000.0; // assume base of meters } + double Representation::GetPlaneAngleConversionFactor() { - LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); + LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); - while (i != context_of_items.end()) { - GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); - if (aGUAC != NULL) { - return aGUAC->GetPlaneAngleConversionFactor(); - } - i++; + while (i != context_of_items.end()) { + GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); + if (aGUAC != NULL) { + return aGUAC->GetPlaneAngleConversionFactor(); } - return 1.0; // assume base of radians + i++; + } + return 1.0; // assume base of radians } + double Representation::GetSolidAngleConversionFactor() { - LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); + LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); - while (i != context_of_items.end()) { - GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); - if (aGUAC != NULL) { - return aGUAC->GetSolidAngleConversionFactor(); - } - i++; + while (i != context_of_items.end()) { + GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); + if (aGUAC != NULL) { + return aGUAC->GetSolidAngleConversionFactor(); } - return 1.0; // assume base of steradians + i++; + } + return 1.0; // assume base of steradians } + bool Representation::Load(STEPWrapper *sw, SCLP23(Application_instance) *sse) { - step=sw; - id = sse->STEPfile_id; + step=sw; + id = sse->STEPfile_id; - // need to do this for local attributes to makes sure we have - // the actual entity and not a complex/supertype parent - sse = step->getEntity(sse,ENTITYNAME); + // need to do this for local attributes to makes sure we have + // the actual entity and not a complex/supertype parent + sse = step->getEntity(sse, ENTITYNAME); - name = step->getStringAttribute(sse,"name"); + name = step->getStringAttribute(sse, "name"); - if (items.empty()) { - LIST_OF_ENTITIES *l = step->getListOfEntities(sse,"items"); - LIST_OF_ENTITIES::iterator i; - for(i=l->begin();i!=l->end();i++) { - SCLP23(Application_instance) *entity = (*i); - if (entity) { - RepresentationItem *aRI = dynamic_cast<RepresentationItem *>(Factory::CreateObject(sw,entity)); - items.push_back(aRI); - } else { - cerr << CLASSNAME << ": Unhandled entity in attribute 'items'." << endl; - return false; - } - } - l->clear(); - delete l; + if (items.empty()) { + LIST_OF_ENTITIES *l = step->getListOfEntities(sse, "items"); + LIST_OF_ENTITIES::iterator i; + for (i=l->begin();i!=l->end();i++) { + SCLP23(Application_instance) *entity = (*i); + if (entity) { + RepresentationItem *aRI = dynamic_cast<RepresentationItem *>(Factory::CreateObject(sw, entity)); + items.push_back(aRI); + } else { + std::cerr << CLASSNAME << ": Unhandled entity in attribute 'items'." << std::endl;; + return false; + } } + l->clear(); + delete l; + } - if (context_of_items.empty()) { - SCLP23(Application_instance) *entity = step->getEntityAttribute(sse,"context_of_items"); - if (entity->IsComplex()) { - SCLP23(Application_instance) *sub_entity = step->getEntity(entity,"Geometric_Representation_Context"); - if (sub_entity) { - GeometricRepresentationContext *aGRC = new GeometricRepresentationContext(); + if (context_of_items.empty()) { + SCLP23(Application_instance) *entity = step->getEntityAttribute(sse, "context_of_items"); + if (entity->IsComplex()) { + SCLP23(Application_instance) *sub_entity = step->getEntity(entity, "Geometric_Representation_Context"); + if (sub_entity) { + GeometricRepresentationContext *aGRC = new GeometricRepresentationContext(); - context_of_items.push_back(aGRC); - if (!aGRC->Load(step,sub_entity)) { - cout << CLASSNAME << ":Error loading GeometricRepresentationContext" << endl; - return false; - } - } + context_of_items.push_back(aGRC); + if (!aGRC->Load(step, sub_entity)) { + std::cout << CLASSNAME << ":Error loading GeometricRepresentationContext" << std::endl;; + return false; + } + } - sub_entity = step->getEntity(entity,"Global_Uncertainty_Assigned_Context"); - if (sub_entity) { - GlobalUncertaintyAssignedContext *aGUAC = new GlobalUncertaintyAssignedContext(); + sub_entity = step->getEntity(entity, "Global_Uncertainty_Assigned_Context"); + if (sub_entity) { + GlobalUncertaintyAssignedContext *aGUAC = new GlobalUncertaintyAssignedContext(); - context_of_items.push_back(aGUAC); - if (!aGUAC->Load(step,sub_entity)) { - cout << CLASSNAME << ":Error loading GlobalUncertaintyAssignedContext" << endl; - return false; - } - } + context_of_items.push_back(aGUAC); + if (!aGUAC->Load(step, sub_entity)) { + std::cout << CLASSNAME << ":Error loading GlobalUncertaintyAssignedContext" << std::endl;; + return false; + } + } - sub_entity = step->getEntity(entity,"Global_Unit_Assigned_Context"); - if (sub_entity) { - GlobalUnitAssignedContext *aGUAC = new GlobalUnitAssignedContext(); + sub_entity = step->getEntity(entity, "Global_Unit_Assigned_Context"); + if (sub_entity) { + GlobalUnitAssignedContext *aGUAC = new GlobalUnitAssignedContext(); - context_of_items.push_back(aGUAC); - if (!aGUAC->Load(step,sub_entity)) { - cout << CLASSNAME << ":Error loading GlobalUnitAssignedContext" << endl; - return false; - } - } + context_of_items.push_back(aGUAC); + if (!aGUAC->Load(step, sub_entity)) { + std::cout << CLASSNAME << ":Error loading GlobalUnitAssignedContext" << std::endl;; + return false; + } + } - sub_entity = step->getEntity(entity,"Parametric_Representation_Context"); - if (sub_entity) { - ParametricRepresentationContext *aPRC = new ParametricRepresentationContext(); + sub_entity = step->getEntity(entity, "Parametric_Representation_Context"); + if (sub_entity) { + ParametricRepresentationContext *aPRC = new ParametricRepresentationContext(); - context_of_items.push_back(aPRC); - if (!aPRC->Load(step,sub_entity)) { - cout << CLASSNAME << ":Error loading ParametricRepresentationContext" << endl; - return false; - } - } - } else { - RepresentationContext *aRC = (RepresentationContext *)Factory::CreateObject(sw,entity); - context_of_items.push_back(aRC); + context_of_items.push_back(aPRC); + if (!aPRC->Load(step, sub_entity)) { + std::cout << CLASSNAME << ":Error loading ParametricRepresentationContext" << std::endl;; + return false; } + } + } else { + RepresentationContext *aRC = (RepresentationContext *)Factory::CreateObject(sw, entity); + context_of_items.push_back(aRC); } - /* - LIST_OF_STRINGS *attributes = step->getAttributes(id); + } + /* + LIST_OF_STRINGS *attributes = step->getAttributes(id); - LIST_OF_STRINGS::iterator i; - for(i=attributes->begin(); i != attributes->end(); ++i) { - string attrName = (*i); + LIST_OF_STRINGS::iterator i; + for (i=attributes->begin(); i != attributes->end(); ++i) { + std::string attrName = (*i); - if (attrName.compare("name") == 0) { - name = step->getStringAttribute(id,attrName.c_str()); - } else if (attrName.compare("items") == 0) { - LIST_OF_ENTITIES *entities = step->getListOfEntities(id,attrName.c_str()); + if (attrName.compare("name") == 0) { + name = step->getStringAttribute(id, attrName.c_str()); + } else if (attrName.compare("items") == 0) { + LIST_OF_ENTITIES *entities = step->getListOfEntities(id, attrName.c_str()); - LIST_OF_ENTITIES::iterator i; - for(i=entities->begin();i!=entities->end();i++) { - SCLP23(Application_instance) *entity = (*i); - if (entity) { - //if ((entity->STEPfile_id > 0 ) && ( entity->IsA(config_control_designe_manifold_solid_brep))) { - //ManifoldSolidBrep *aMSB = new ManifoldSolidBrep(); - RepresentationItem *aRI = (RepresentationItem *)Factory::CreateRepresentationItemObject(sw,entity); + LIST_OF_ENTITIES::iterator i; + for (i=entities->begin();i!=entities->end();i++) { + SCLP23(Application_instance) *entity = (*i); + if (entity) { + //if ((entity->STEPfile_id > 0) && (entity->IsA(config_control_designe_manifold_solid_brep))) { + //ManifoldSolidBrep *aMSB = new ManifoldSolidBrep(); + RepresentationItem *aRI = (RepresentationItem *)Factory::CreateRepresentationItemObject(sw, entity); - items.push_back(aRI); + items.push_back(aRI); - //if ( !aMSB->Load(step,entity)) { - // cout << CLASSNAME << "::" << __func__ << "()" << ":Error loading ManifoldSolidBrep." << endl; - // return false; - //} - } else { - cout << CLASSNAME << "::" << __func__ << "()" << ":Unhandled entity in attribute 'items': " << entity->EntityName() << endl; - return false; - } - } + //if (!aMSB->Load(step, entity)) { + // std::cout << CLASSNAME << "::" << __func__ << "()" << ":Error loading ManifoldSolidBrep." << std::endl;; + // return false; + //} + } else { + std::cout << CLASSNAME << "::" << __func__ << "()" << ":Unhandled entity in attribute 'items': " << entity->EntityName() << std::endl;; + return false; + } + } - entities->clear(); - delete entities; + entities->clear(); + delete entities; - } else if (attrName.compare("context_of_items") == 0) { - SCLP23(Application_instance) *ae = step->getEntityAttribute(sse,"context_of_items"); + } else if (attrName.compare("context_of_items") == 0) { + SCLP23(Application_instance) *ae = step->getEntityAttribute(sse, "context_of_items"); - int aeID = ae->STEPfile_id; - SCLP23(Application_instance) *entity = step->getEntity(aeID,"Geometric_Representation_Context"); - if (entity) { - GeometricRepresentationContext *aGRC = new GeometricRepresentationContext(); + int aeID = ae->STEPfile_id; + SCLP23(Application_instance) *entity = step->getEntity(aeID, "Geometric_Representation_Context"); + if (entity) { + GeometricRepresentationContext *aGRC = new GeometricRepresentationContext(); - context_of_items.push_back(aGRC); - if (!aGRC->Load(step,entity)) { - cout << CLASSNAME << ":Error loading GeometricRepresentationContext" << endl; - return false; - } - } + context_of_items.push_back(aGRC); + if (!aGRC->Load(step, entity)) { + std::cout << CLASSNAME << ":Error loading GeometricRepresentationContext" << std::endl;; + return false; + } + } - entity = step->getEntity(aeID,"Global_Uncertainty_Assigned_Context"); + entity = step->getEntity(aeID, "Global_Uncertainty_Assigned_Context"); - if (entity) { - GlobalUncertaintyAssignedContext *aGUAC = new GlobalUncertaintyAssignedContext(); + if (entity) { + GlobalUncertaintyAssignedContext *aGUAC = new GlobalUncertaintyAssignedContext(); - context_of_items.push... [truncated message content] |
From: <br...@us...> - 2009-12-22 15:48:21
|
Revision: 36979 http://brlcad.svn.sourceforge.net/brlcad/?rev=36979&view=rev Author: brlcad Date: 2009-12-22 15:48:11 +0000 (Tue, 22 Dec 2009) Log Message: ----------- use the updated (Boolean) and (BOOLEAN) instead of (Bool) and (BOOL), so as to avoid a conflict with other codes. Modified Paths: -------------- brlcad/trunk/src/conv/step/CompositeCurveSegment.h brlcad/trunk/src/conv/step/CurveBoundedSurface.cpp brlcad/trunk/src/conv/step/CurveBoundedSurface.h brlcad/trunk/src/conv/step/EdgeCurve.cpp brlcad/trunk/src/conv/step/EdgeCurve.h brlcad/trunk/src/conv/step/FaceBound.cpp brlcad/trunk/src/conv/step/FaceBound.h brlcad/trunk/src/conv/step/FaceSurface.cpp brlcad/trunk/src/conv/step/FaceSurface.h brlcad/trunk/src/conv/step/OrientedEdge.cpp brlcad/trunk/src/conv/step/OrientedEdge.h brlcad/trunk/src/conv/step/RectangularTrimmedSurface.cpp brlcad/trunk/src/conv/step/RectangularTrimmedSurface.h brlcad/trunk/src/conv/step/STEPWrapper.cpp brlcad/trunk/src/conv/step/STEPWrapper.h brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.cc brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.h brlcad/trunk/src/conv/step/SurfacePatch.h brlcad/trunk/src/conv/step/TrimmedCurve.h Modified: brlcad/trunk/src/conv/step/CompositeCurveSegment.h =================================================================== --- brlcad/trunk/src/conv/step/CompositeCurveSegment.h 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/CompositeCurveSegment.h 2009-12-22 15:48:11 UTC (rev 36979) @@ -38,7 +38,7 @@ protected: Curve *parent_curve; Transition_code transition; - SCLBOOL_H(Bool) same_sense; + SCLBOOL_H(Boolean) same_sense; public: CompositeCurveSegment(); Modified: brlcad/trunk/src/conv/step/CurveBoundedSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/CurveBoundedSurface.cpp 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/CurveBoundedSurface.cpp 2009-12-22 15:48:11 UTC (rev 36979) @@ -112,7 +112,7 @@ (*i)->Print(level+1); } - TAB(level+1); cout << "implicit_outer:" << step->getBooleanString((SCLBOOL_H(Bool))implicit_outer) << endl; + TAB(level+1); cout << "implicit_outer:" << step->getBooleanString((SCLBOOL_H(Boolean))implicit_outer) << endl; TAB(level); cout << "Inherited Attributes:" << endl; BoundedSurface::Print(level+1); Modified: brlcad/trunk/src/conv/step/CurveBoundedSurface.h =================================================================== --- brlcad/trunk/src/conv/step/CurveBoundedSurface.h 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/CurveBoundedSurface.h 2009-12-22 15:48:11 UTC (rev 36979) @@ -42,7 +42,7 @@ LIST_OF_BOUNDARIES boundaries; //TODO: Fix all references to YAYA #ifdef YAYA - SCLBOOL_H(Bool) implicit_outer; + SCLBOOL_H(Boolean) implicit_outer; #else int implicit_outer; #endif Modified: brlcad/trunk/src/conv/step/EdgeCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/EdgeCurve.cpp 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/EdgeCurve.cpp 2009-12-22 15:48:11 UTC (rev 36979) @@ -92,7 +92,7 @@ TAB(level+1); cout << "edge_geometry:" << endl; edge_geometry->Print(level+1); - TAB(level+1); cout << "same_sense:" << step->getBooleanString((SCLBOOL_H(Bool))same_sense) << endl; + TAB(level+1); cout << "same_sense:" << step->getBooleanString((SCLBOOL_H(Boolean))same_sense) << endl; TAB(level); cout << "Inherited Attributes:" << endl; Edge::Print(level+1); Modified: brlcad/trunk/src/conv/step/EdgeCurve.h =================================================================== --- brlcad/trunk/src/conv/step/EdgeCurve.h 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/EdgeCurve.h 2009-12-22 15:48:11 UTC (rev 36979) @@ -38,7 +38,7 @@ protected: #ifdef YAYA - SCLBOOL_H(Bool) same_sense; + SCLBOOL_H(Boolean) same_sense; #else int same_sense; #endif Modified: brlcad/trunk/src/conv/step/FaceBound.cpp =================================================================== --- brlcad/trunk/src/conv/step/FaceBound.cpp 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/FaceBound.cpp 2009-12-22 15:48:11 UTC (rev 36979) @@ -91,7 +91,7 @@ TAB(level+1); cout << "bound:" << endl; bound->Print(level+1); - TAB(level+1); cout << "orientation:" << step->getBooleanString((SCLBOOL_H(Bool))orientation) << endl; + TAB(level+1); cout << "orientation:" << step->getBooleanString((SCLBOOL_H(Boolean))orientation) << endl; TAB(level); cout << "Inherited Attributes:" << endl; TopologicalRepresentationItem::Print(level+1); Modified: brlcad/trunk/src/conv/step/FaceBound.h =================================================================== --- brlcad/trunk/src/conv/step/FaceBound.h 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/FaceBound.h 2009-12-22 15:48:11 UTC (rev 36979) @@ -43,7 +43,7 @@ int ON_face_index; bool inner; #ifdef YAYA - SCLBOOL_H(Bool) orientation; + SCLBOOL_H(Boolean) orientation; #else int orientation; #endif Modified: brlcad/trunk/src/conv/step/FaceSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/FaceSurface.cpp 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/FaceSurface.cpp 2009-12-22 15:48:11 UTC (rev 36979) @@ -95,7 +95,7 @@ TAB(level+1); cout << "face_geometry:" << endl; face_geometry->Print(level+1); - TAB(level+1); cout << "same_sense:" << step->getBooleanString((SCLBOOL_H(Bool))same_sense) << endl; + TAB(level+1); cout << "same_sense:" << step->getBooleanString((SCLBOOL_H(Boolean))same_sense) << endl; TAB(level); cout << "Inherited Attributes:" << endl; Face::Print(level+1); Modified: brlcad/trunk/src/conv/step/FaceSurface.h =================================================================== --- brlcad/trunk/src/conv/step/FaceSurface.h 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/FaceSurface.h 2009-12-22 15:48:11 UTC (rev 36979) @@ -40,7 +40,7 @@ protected: Surface *face_geometry; #ifdef YAYA - SCLBOOL_H(Bool) same_sense; + SCLBOOL_H(Boolean) same_sense; #else int same_sense; #endif Modified: brlcad/trunk/src/conv/step/OrientedEdge.cpp =================================================================== --- brlcad/trunk/src/conv/step/OrientedEdge.cpp 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/OrientedEdge.cpp 2009-12-22 15:48:11 UTC (rev 36979) @@ -95,7 +95,7 @@ TAB(level); cout << "Attributes:" << endl; TAB(level+1); cout << "edge_element:" << endl; edge_element->Print(level+1); - TAB(level+1); cout << "orientation:" << step->getBooleanString((SCLBOOL_H(Bool))orientation) << endl; + TAB(level+1); cout << "orientation:" << step->getBooleanString((SCLBOOL_H(Boolean))orientation) << endl; } @@ -120,7 +120,7 @@ bool OrientedEdge::OrientWithEdge() { - if ((SCLBOOL_H(Bool))orientation == SCLBOOL_H(BTrue)) { + if ((SCLBOOL_H(Boolean))orientation == SCLBOOL_H(BTrue)) { return true; } return false; Modified: brlcad/trunk/src/conv/step/OrientedEdge.h =================================================================== --- brlcad/trunk/src/conv/step/OrientedEdge.h 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/OrientedEdge.h 2009-12-22 15:48:11 UTC (rev 36979) @@ -35,7 +35,7 @@ protected: #ifdef YAYA - SCLBOOL_H(Bool) orientation; + SCLBOOL_H(Boolean) orientation; #else int orientation; #endif Modified: brlcad/trunk/src/conv/step/RectangularTrimmedSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/RectangularTrimmedSurface.cpp 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/RectangularTrimmedSurface.cpp 2009-12-22 15:48:11 UTC (rev 36979) @@ -97,8 +97,8 @@ TAB(level+1); cout << "v1:" << u1 << endl; TAB(level+1); cout << "v2:" << u2 << endl; - TAB(level+1); cout << "usense:" << step->getBooleanString((SCLBOOL_H(Bool))usense) << endl; - TAB(level+1); cout << "vsense:" << step->getBooleanString((SCLBOOL_H(Bool))vsense) << endl; + TAB(level+1); cout << "usense:" << step->getBooleanString((SCLBOOL_H(Boolean))usense) << endl; + TAB(level+1); cout << "vsense:" << step->getBooleanString((SCLBOOL_H(Boolean))vsense) << endl; TAB(level); cout << "Inherited Attributes:" << endl; BoundedSurface::Print(level+1); Modified: brlcad/trunk/src/conv/step/RectangularTrimmedSurface.h =================================================================== --- brlcad/trunk/src/conv/step/RectangularTrimmedSurface.h 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/RectangularTrimmedSurface.h 2009-12-22 15:48:11 UTC (rev 36979) @@ -43,8 +43,8 @@ double v2; //TODO: Fix all references to YAYA #ifdef YAYA - SCLBOOL_H(Bool) usense; - SCLBOOL_H(Bool) vsense; + SCLBOOL_H(Boolean) usense; + SCLBOOL_H(Boolean) vsense; #else int usense; int vsense; Modified: brlcad/trunk/src/conv/step/STEPWrapper.cpp =================================================================== --- brlcad/trunk/src/conv/step/STEPWrapper.cpp 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/STEPWrapper.cpp 2009-12-22 15:48:11 UTC (rev 36979) @@ -166,10 +166,10 @@ } -SCLBOOL_H(Bool) +SCLBOOL_H(Boolean) STEPWrapper::getBooleanAttribute(int STEPid, const char *name) { - SCLBOOL_H(Bool) retValue = SCLBOOL_H(BUnset); + SCLBOOL_H(Boolean) retValue = SCLBOOL_H(BUnset); SCLP23(Application_instance) *sse = instance_list.FindFileId(STEPid)->GetSTEPentity(); sse->ResetAttributes(); @@ -179,7 +179,7 @@ std::string attrname = attr->Name(); if (attrname.compare(name) == 0) { - retValue = (SCLBOOL_H(Bool))(*attr->ptr.e).asInt(); + retValue = (SCLBOOL_H(Boolean))(*attr->ptr.e).asInt(); if (retValue > SCLBOOL_H(BUnset)) retValue = SCLBOOL_H(BUnset); break; @@ -257,7 +257,7 @@ std::string -STEPWrapper::getBooleanString(SCLBOOL_H(Bool) v) +STEPWrapper::getBooleanString(SCLBOOL_H(Boolean) v) { std::string retValue = "Unknown"; @@ -531,10 +531,10 @@ } -SCLBOOL_H(Bool) +SCLBOOL_H(Boolean) STEPWrapper::getBooleanAttribute(SCLP23(Application_instance) *sse, const char *name) { - SCLBOOL_H(Bool) retValue = SCLBOOL_H(BUnset); + SCLBOOL_H(Boolean) retValue = SCLBOOL_H(BUnset); sse->ResetAttributes(); @@ -543,7 +543,7 @@ std::string attrname = attr->Name(); if (attrname.compare(name) == 0) { - retValue = (SCLBOOL_H(Bool))(*attr->ptr.e).asInt(); + retValue = (SCLBOOL_H(Boolean))(*attr->ptr.e).asInt(); if (retValue > SCLBOOL_H(BUnset)) retValue = SCLBOOL_H(BUnset); break; Modified: brlcad/trunk/src/conv/step/STEPWrapper.h =================================================================== --- brlcad/trunk/src/conv/step/STEPWrapper.h 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/STEPWrapper.h 2009-12-22 15:48:11 UTC (rev 36979) @@ -89,12 +89,12 @@ SCLP23(Application_instance) *getEntity( int STEPid, const char *name ); SCLP23(Application_instance) *getEntity( SCLP23(Application_instance) *, const char *name ); string getLogicalString( SCLLOG_H(Logical) v ); - string getBooleanString( SCLBOOL_H(Bool) v ); + string getBooleanString( SCLBOOL_H(Boolean) v ); // helper functions based on STEP id STEPattribute *getAttribute( int STEPid, const char *name ); LIST_OF_STRINGS *getAttributes( int STEPid ); - SCLBOOL_H(Bool) getBooleanAttribute( int STEPid, const char *name ); + SCLBOOL_H(Boolean) getBooleanAttribute( int STEPid, const char *name ); SCLP23(Application_instance) *getEntityAttribute( int STEPid, const char *name ); int getEnumAttribute( int STEPid, const char *name ); int getIntegerAttribute( int STEPid, const char *name ); @@ -110,7 +110,7 @@ //helper functions based on entity instance pointer STEPattribute *getAttribute( SCLP23(Application_instance) *sse, const char *name ); LIST_OF_STRINGS *getAttributes( SCLP23(Application_instance) *sse ); - SCLBOOL_H(Bool) getBooleanAttribute( SCLP23(Application_instance) *sse, const char *name ); + SCLBOOL_H(Boolean) getBooleanAttribute( SCLP23(Application_instance) *sse, const char *name ); SCLP23(Application_instance) *getEntityAttribute( SCLP23(Application_instance) *sse, const char *name ); SCLP23(Select) *getSelectAttribute( SCLP23(Application_instance) *sse, const char *name ); int getEnumAttribute( SCLP23(Application_instance) *sse, const char *name ); Modified: brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.cc =================================================================== --- brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.cc 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.cc 2009-12-22 15:48:11 UTC (rev 36979) @@ -4093,7 +4093,7 @@ Error( "Mismatch in underlying type." ); } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiReversible_topology_item::orientation_() const { if( CurrentUnderlyingType () == config_control_designe_face_bound ) @@ -4101,12 +4101,12 @@ return ((SdaiFace_bound_ptr) _app_inst) ->orientation_(); cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; - return (SCLBOOL(Bool)) 0; + return (SCLBOOL(Boolean)) 0; } void -SdaiReversible_topology_item::orientation_ (const SCLBOOL(Bool) x) +SdaiReversible_topology_item::orientation_ (const SCLBOOL(Boolean) x) { if( CurrentUnderlyingType () == config_control_designe_face_bound ) @@ -28877,14 +28877,14 @@ _bound = x; } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiFace_bound::orientation_() const { - return (SCLBOOL(Bool)) _orientation; + return (SCLBOOL(Boolean)) _orientation; } void -SdaiFace_bound::orientation_ (const SCLBOOL(Bool) x) +SdaiFace_bound::orientation_ (const SCLBOOL(Boolean) x) { _orientation.put (x); @@ -29691,14 +29691,14 @@ _edge_element = x; } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiOriented_edge::orientation_() const { - return (SCLBOOL(Bool)) _orientation; + return (SCLBOOL(Boolean)) _orientation; } void -SdaiOriented_edge::orientation_ (const SCLBOOL(Bool) x) +SdaiOriented_edge::orientation_ (const SCLBOOL(Boolean) x) { _orientation.put (x); @@ -35361,14 +35361,14 @@ _open_shell_element = x; } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiOriented_open_shell::orientation_() const { - return (SCLBOOL(Bool)) _orientation; + return (SCLBOOL(Boolean)) _orientation; } void -SdaiOriented_open_shell::orientation_ (const SCLBOOL(Bool) x) +SdaiOriented_open_shell::orientation_ (const SCLBOOL(Boolean) x) { _orientation.put (x); @@ -36572,14 +36572,14 @@ _transition.put (x); } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiComposite_curve_segment::same_sense_() const { - return (SCLBOOL(Bool)) _same_sense; + return (SCLBOOL(Boolean)) _same_sense; } void -SdaiComposite_curve_segment::same_sense_ (const SCLBOOL(Bool) x) +SdaiComposite_curve_segment::same_sense_ (const SCLBOOL(Boolean) x) { _same_sense.put (x); @@ -41005,14 +41005,14 @@ { _trim_2.ShallowCopy (*x); } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiTrimmed_curve::sense_agreement_() const { - return (SCLBOOL(Bool)) _sense_agreement; + return (SCLBOOL(Boolean)) _sense_agreement; } void -SdaiTrimmed_curve::sense_agreement_ (const SCLBOOL(Bool) x) +SdaiTrimmed_curve::sense_agreement_ (const SCLBOOL(Boolean) x) { _sense_agreement.put (x); @@ -44905,14 +44905,14 @@ MakeDerived ("dim"); } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiDegenerate_toroidal_surface::select_outer_() const { - return (SCLBOOL(Bool)) _select_outer; + return (SCLBOOL(Boolean)) _select_outer; } void -SdaiDegenerate_toroidal_surface::select_outer_ (const SCLBOOL(Bool) x) +SdaiDegenerate_toroidal_surface::select_outer_ (const SCLBOOL(Boolean) x) { _select_outer.put (x); @@ -46083,14 +46083,14 @@ _face_geometry = x; } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiFace_surface::same_sense_() const { - return (SCLBOOL(Bool)) _same_sense; + return (SCLBOOL(Boolean)) _same_sense; } void -SdaiFace_surface::same_sense_ (const SCLBOOL(Bool) x) +SdaiFace_surface::same_sense_ (const SCLBOOL(Boolean) x) { _same_sense.put (x); @@ -46260,14 +46260,14 @@ _face_element = x; } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiOriented_face::orientation_() const { - return (SCLBOOL(Bool)) _orientation; + return (SCLBOOL(Boolean)) _orientation; } void -SdaiOriented_face::orientation_ (const SCLBOOL(Bool) x) +SdaiOriented_face::orientation_ (const SCLBOOL(Boolean) x) { _orientation.put (x); @@ -46681,14 +46681,14 @@ _edge_geometry = x; } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiEdge_curve::same_sense_() const { - return (SCLBOOL(Bool)) _same_sense; + return (SCLBOOL(Boolean)) _same_sense; } void -SdaiEdge_curve::same_sense_ (const SCLBOOL(Bool) x) +SdaiEdge_curve::same_sense_ (const SCLBOOL(Boolean) x) { _same_sense.put (x); @@ -47722,27 +47722,27 @@ _v2 = x; } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiRectangular_trimmed_surface::usense_() const { - return (SCLBOOL(Bool)) _usense; + return (SCLBOOL(Boolean)) _usense; } void -SdaiRectangular_trimmed_surface::usense_ (const SCLBOOL(Bool) x) +SdaiRectangular_trimmed_surface::usense_ (const SCLBOOL(Boolean) x) { _usense.put (x); } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiRectangular_trimmed_surface::vsense_() const { - return (SCLBOOL(Bool)) _vsense; + return (SCLBOOL(Boolean)) _vsense; } void -SdaiRectangular_trimmed_surface::vsense_ (const SCLBOOL(Bool) x) +SdaiRectangular_trimmed_surface::vsense_ (const SCLBOOL(Boolean) x) { _vsense.put (x); @@ -51053,14 +51053,14 @@ { _boundaries.ShallowCopy (*x); } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiCurve_bounded_surface::implicit_outer_() const { - return (SCLBOOL(Bool)) _implicit_outer; + return (SCLBOOL(Boolean)) _implicit_outer; } void -SdaiCurve_bounded_surface::implicit_outer_ (const SCLBOOL(Bool) x) +SdaiCurve_bounded_surface::implicit_outer_ (const SCLBOOL(Boolean) x) { _implicit_outer.put (x); @@ -54842,14 +54842,14 @@ _path_element = x; } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiOriented_path::orientation_() const { - return (SCLBOOL(Bool)) _orientation; + return (SCLBOOL(Boolean)) _orientation; } void -SdaiOriented_path::orientation_ (const SCLBOOL(Bool) x) +SdaiOriented_path::orientation_ (const SCLBOOL(Boolean) x) { _orientation.put (x); @@ -56082,27 +56082,27 @@ _v_transition.put (x); } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiSurface_patch::u_sense_() const { - return (SCLBOOL(Bool)) _u_sense; + return (SCLBOOL(Boolean)) _u_sense; } void -SdaiSurface_patch::u_sense_ (const SCLBOOL(Bool) x) +SdaiSurface_patch::u_sense_ (const SCLBOOL(Boolean) x) { _u_sense.put (x); } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiSurface_patch::v_sense_() const { - return (SCLBOOL(Bool)) _v_sense; + return (SCLBOOL(Boolean)) _v_sense; } void -SdaiSurface_patch::v_sense_ (const SCLBOOL(Bool) x) +SdaiSurface_patch::v_sense_ (const SCLBOOL(Boolean) x) { _v_sense.put (x); @@ -58489,14 +58489,14 @@ _closed_shell_element = x; } -const SCLBOOL(Bool) +const SCLBOOL(Boolean) SdaiOriented_closed_shell::orientation_() const { - return (SCLBOOL(Bool)) _orientation; + return (SCLBOOL(Boolean)) _orientation; } void -SdaiOriented_closed_shell::orientation_ (const SCLBOOL(Bool) x) +SdaiOriented_closed_shell::orientation_ (const SCLBOOL(Boolean) x) { _orientation.put (x); Modified: brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.h =================================================================== --- brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.h 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.h 2009-12-22 15:48:11 UTC (rev 36979) @@ -1580,8 +1580,8 @@ const EntityAggregate_ptr cfs_faces_() const; void cfs_faces_ (const EntityAggregate_ptr x); - const SCLBOOL(Bool) orientation_() const; - void orientation_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) orientation_() const; + void orientation_ (const SCLBOOL(Boolean) x); const SdaiLoop_ptr bound_() const; void bound_ (const SdaiLoop_ptr x); @@ -8257,7 +8257,7 @@ #endif protected: SCLP23(Application_instance_ptr) _bound ; - SCLP23(BOOL) _orientation ; + SCLP23(BOOLEAN) _orientation ; public: SdaiFace_bound ( ); @@ -8273,8 +8273,8 @@ const SdaiLoop_ptr bound_() const; void bound_ (const SdaiLoop_ptr x); - const SCLBOOL(Bool) orientation_() const; - void orientation_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) orientation_() const; + void orientation_ (const SCLBOOL(Boolean) x); /* The first parent's access functions are */ /* above or covered by inherited functions. */ @@ -8624,7 +8624,7 @@ #endif protected: SCLP23(Application_instance_ptr) _edge_element ; - SCLP23(BOOL) _orientation ; + SCLP23(BOOLEAN) _orientation ; public: SdaiOriented_edge ( ); @@ -8640,8 +8640,8 @@ const SdaiEdge_ptr edge_element_() const; void edge_element_ (const SdaiEdge_ptr x); - const SCLBOOL(Bool) orientation_() const; - void orientation_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) orientation_() const; + void orientation_ (const SCLBOOL(Boolean) x); /* The first parent's access functions are */ /* above or covered by inherited functions. */ @@ -10916,7 +10916,7 @@ #endif protected: SCLP23(Application_instance_ptr) _open_shell_element ; - SCLP23(BOOL) _orientation ; + SCLP23(BOOLEAN) _orientation ; public: SdaiOriented_open_shell ( ); @@ -10932,8 +10932,8 @@ const SdaiOpen_shell_ptr open_shell_element_() const; void open_shell_element_ (const SdaiOpen_shell_ptr x); - const SCLBOOL(Bool) orientation_() const; - void orientation_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) orientation_() const; + void orientation_ (const SCLBOOL(Boolean) x); /* The first parent's access functions are */ /* above or covered by inherited functions. */ @@ -11414,7 +11414,7 @@ #endif protected: SdaiTransition_code_var _transition ; - SCLP23(BOOL) _same_sense ; + SCLP23(BOOLEAN) _same_sense ; SCLP23(Application_instance_ptr) _parent_curve ; EntityAggregate _using_curves ; // of composite_curve @@ -11433,8 +11433,8 @@ const SdaiTransition_code_var transition_() const; void transition_ (const SdaiTransition_code_var x); - const SCLBOOL(Bool) same_sense_() const; - void same_sense_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) same_sense_() const; + void same_sense_ (const SCLBOOL(Boolean) x); const SdaiCurve_ptr parent_curve_() const; void parent_curve_ (const SdaiCurve_ptr x); @@ -13283,7 +13283,7 @@ SdaiTrimming_selects _trim_2 ; // of trimming_select - SCLP23(BOOL) _sense_agreement ; + SCLP23(BOOLEAN) _sense_agreement ; SdaiTrimming_preference_var _master_representation ; public: @@ -13306,8 +13306,8 @@ const SdaiTrimming_selects_ptr trim_2_() const; void trim_2_ (const SdaiTrimming_selects_ptr x); - const SCLBOOL(Bool) sense_agreement_() const; - void sense_agreement_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) sense_agreement_() const; + void sense_agreement_ (const SCLBOOL(Boolean) x); const SdaiTrimming_preference_var master_representation_() const; void master_representation_ (const SdaiTrimming_preference_var x); @@ -14829,7 +14829,7 @@ enum os_access_reason, void *, void *, void *); #endif protected: - SCLP23(BOOL) _select_outer ; + SCLP23(BOOLEAN) _select_outer ; public: SdaiDegenerate_toroidal_surface ( ); @@ -14842,8 +14842,8 @@ #endif int opcode () { return 149 ; } - const SCLBOOL(Bool) select_outer_() const; - void select_outer_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) select_outer_() const; + void select_outer_ (const SCLBOOL(Boolean) x); /* The first parent's access functions are */ /* above or covered by inherited functions. */ @@ -15368,7 +15368,7 @@ #endif protected: SCLP23(Application_instance_ptr) _face_geometry ; - SCLP23(BOOL) _same_sense ; + SCLP23(BOOLEAN) _same_sense ; public: SdaiFace_surface ( ); @@ -15384,8 +15384,8 @@ const SdaiSurface_ptr face_geometry_() const; void face_geometry_ (const SdaiSurface_ptr x); - const SCLBOOL(Bool) same_sense_() const; - void same_sense_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) same_sense_() const; + void same_sense_ (const SCLBOOL(Boolean) x); /* The first parent's access functions are */ /* above or covered by inherited functions. */ @@ -15438,7 +15438,7 @@ #endif protected: SCLP23(Application_instance_ptr) _face_element ; - SCLP23(BOOL) _orientation ; + SCLP23(BOOLEAN) _orientation ; public: SdaiOriented_face ( ); @@ -15454,8 +15454,8 @@ const SdaiFace_ptr face_element_() const; void face_element_ (const SdaiFace_ptr x); - const SCLBOOL(Bool) orientation_() const; - void orientation_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) orientation_() const; + void orientation_ (const SCLBOOL(Boolean) x); /* The first parent's access functions are */ /* above or covered by inherited functions. */ @@ -15619,7 +15619,7 @@ #endif protected: SCLP23(Application_instance_ptr) _edge_geometry ; - SCLP23(BOOL) _same_sense ; + SCLP23(BOOLEAN) _same_sense ; public: SdaiEdge_curve ( ); @@ -15635,8 +15635,8 @@ const SdaiCurve_ptr edge_geometry_() const; void edge_geometry_ (const SdaiCurve_ptr x); - const SCLBOOL(Bool) same_sense_() const; - void same_sense_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) same_sense_() const; + void same_sense_ (const SCLBOOL(Boolean) x); /* The first parent's access functions are */ /* above or covered by inherited functions. */ @@ -15909,8 +15909,8 @@ SCLP23(Real) _u2 ; SCLP23(Real) _v1 ; SCLP23(Real) _v2 ; - SCLP23(BOOL) _usense ; - SCLP23(BOOL) _vsense ; + SCLP23(BOOLEAN) _usense ; + SCLP23(BOOLEAN) _vsense ; public: SdaiRectangular_trimmed_surface ( ); @@ -15938,11 +15938,11 @@ const SdaiParameter_value v2_() const; void v2_ (const SdaiParameter_value x); - const SCLBOOL(Bool) usense_() const; - void usense_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) usense_() const; + void usense_ (const SCLBOOL(Boolean) x); - const SCLBOOL(Bool) vsense_() const; - void vsense_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) vsense_() const; + void vsense_ (const SCLBOOL(Boolean) x); /* The first parent's access functions are */ /* above or covered by inherited functions. */ @@ -17344,7 +17344,7 @@ SCLP23(Application_instance_ptr) _basis_surface ; EntityAggregate _boundaries ; // of boundary_curve - SCLP23(BOOL) _implicit_outer ; + SCLP23(BOOLEAN) _implicit_outer ; public: SdaiCurve_bounded_surface ( ); @@ -17363,8 +17363,8 @@ const EntityAggregate_ptr boundaries_() const; void boundaries_ (const EntityAggregate_ptr x); - const SCLBOOL(Bool) implicit_outer_() const; - void implicit_outer_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) implicit_outer_() const; + void implicit_outer_ (const SCLBOOL(Boolean) x); /* The first parent's access functions are */ /* above or covered by inherited functions. */ @@ -19013,7 +19013,7 @@ #endif protected: SCLP23(Application_instance_ptr) _path_element ; - SCLP23(BOOL) _orientation ; + SCLP23(BOOLEAN) _orientation ; public: SdaiOriented_path ( ); @@ -19029,8 +19029,8 @@ const SdaiPath_ptr path_element_() const; void path_element_ (const SdaiPath_ptr x); - const SCLBOOL(Bool) orientation_() const; - void orientation_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) orientation_() const; + void orientation_ (const SCLBOOL(Boolean) x); /* The first parent's access functions are */ /* above or covered by inherited functions. */ @@ -19509,8 +19509,8 @@ SCLP23(Application_instance_ptr) _parent_surface ; SdaiTransition_code_var _u_transition ; SdaiTransition_code_var _v_transition ; - SCLP23(BOOL) _u_sense ; - SCLP23(BOOL) _v_sense ; + SCLP23(BOOLEAN) _u_sense ; + SCLP23(BOOLEAN) _v_sense ; EntityAggregate _using_surfaces ; // of rectangular_composite_surface public: @@ -19534,11 +19534,11 @@ const SdaiTransition_code_var v_transition_() const; void v_transition_ (const SdaiTransition_code_var x); - const SCLBOOL(Bool) u_sense_() const; - void u_sense_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) u_sense_() const; + void u_sense_ (const SCLBOOL(Boolean) x); - const SCLBOOL(Bool) v_sense_() const; - void v_sense_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) v_sense_() const; + void v_sense_ (const SCLBOOL(Boolean) x); const EntityAggregate_ptr using_surfaces_() const; void using_surfaces_ (const EntityAggregate_ptr x); @@ -20520,7 +20520,7 @@ #endif protected: SCLP23(Application_instance_ptr) _closed_shell_element ; - SCLP23(BOOL) _orientation ; + SCLP23(BOOLEAN) _orientation ; public: SdaiOriented_closed_shell ( ); @@ -20536,8 +20536,8 @@ const SdaiClosed_shell_ptr closed_shell_element_() const; void closed_shell_element_ (const SdaiClosed_shell_ptr x); - const SCLBOOL(Bool) orientation_() const; - void orientation_ (const SCLBOOL(Bool) x); + const SCLBOOL(Boolean) orientation_() const; + void orientation_ (const SCLBOOL(Boolean) x); /* The first parent's access functions are */ /* above or covered by inherited functions. */ Modified: brlcad/trunk/src/conv/step/SurfacePatch.h =================================================================== --- brlcad/trunk/src/conv/step/SurfacePatch.h 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/SurfacePatch.h 2009-12-22 15:48:11 UTC (rev 36979) @@ -39,8 +39,8 @@ BoundedSurface *parent_surface; Transition_code u_transition; Transition_code v_transition; - SCLBOOL_H(Bool) u_sense; - SCLBOOL_H(Bool) v_sense; + SCLBOOL_H(Boolean) u_sense; + SCLBOOL_H(Boolean) v_sense; public: SurfacePatch(); Modified: brlcad/trunk/src/conv/step/TrimmedCurve.h =================================================================== --- brlcad/trunk/src/conv/step/TrimmedCurve.h 2009-12-22 15:41:51 UTC (rev 36978) +++ brlcad/trunk/src/conv/step/TrimmedCurve.h 2009-12-22 15:48:11 UTC (rev 36979) @@ -40,7 +40,7 @@ Curve *basis_curve; LIST_OF_TRIMMING_SELECT trim_1; LIST_OF_TRIMMING_SELECT trim_2; - SCLBOOL_H(Bool) sense_agreement; + SCLBOOL_H(Boolean) sense_agreement; Trimming_preference master_representation; public: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-12-22 15:55:20
|
Revision: 36980 http://brlcad.svn.sourceforge.net/brlcad/?rev=36980&view=rev Author: brlcad Date: 2009-12-22 15:55:11 +0000 (Tue, 22 Dec 2009) Log Message: ----------- cleanup, declare interface headers, reorder accordingly; consistent formatting Modified Paths: -------------- brlcad/trunk/src/conv/step/Factory.cpp brlcad/trunk/src/conv/step/Factory.h Modified: brlcad/trunk/src/conv/step/Factory.cpp =================================================================== --- brlcad/trunk/src/conv/step/Factory.cpp 2009-12-22 15:48:11 UTC (rev 36979) +++ brlcad/trunk/src/conv/step/Factory.cpp 2009-12-22 15:55:11 UTC (rev 36980) @@ -23,10 +23,13 @@ * */ +/* interface header */ +#include "Factory.h" + +/* implementation headers */ #include "STEPWrapper.h" #include "STEPEntity.h" -#include "Factory.h" #define CLASSNAME "Factory" const char* Factory::factoryname = "AP203e2 Object Factory"; @@ -37,635 +40,659 @@ Factory::ID_TO_INDEX_MAP Factory::vertex_to_index; Factory::INDEX_TO_ID_MAP Factory::vertex_index_to_id; -Factory::Factory() { + +Factory::Factory() +{ } -Factory::~Factory() { + +Factory::~Factory() +{ } + FACTORYMAP & -Factory::GetMap() { - static FACTORYMAP *factorymap = new FACTORYMAP; // Using the "construct on first use" idiom - return *factorymap; +Factory::GetMap() +{ + static FACTORYMAP *factorymap = new FACTORYMAP; // Using the "construct on first use" idiom + return *factorymap; } -void Factory::Print() { - FACTORYMAP &methodmap = GetMap(); - FACTORYMAP::iterator i; - cout << "Map size: " << methodmap.size() << endl; +void Factory::Print() +{ + FACTORYMAP &methodmap = GetMap(); - for (FACTORYMAP::iterator ii = methodmap.begin(); ii != methodmap.end(); ++ii) { - cout << "\t" << (*ii).first << endl; - } + FACTORYMAP::iterator i; + cout << "Map size: " << methodmap.size() << endl; + + for (FACTORYMAP::iterator ii = methodmap.begin(); ii != methodmap.end(); ++ii) { + cout << "\t" << (*ii).first << endl; + } } + STEPEntity * -Factory::CreateObject(STEPWrapper *sw, SCLP23(Application_instance) *sse) { - string methodname = sse->EntityName(); - FACTORYMAP &methodmap = GetMap(); - FactoryMethod f; - FACTORYMAP::iterator i; +Factory::CreateObject(STEPWrapper *sw, SCLP23(Application_instance) *sse) +{ + string methodname = sse->EntityName(); + FACTORYMAP &methodmap = GetMap(); + FactoryMethod f; + FACTORYMAP::iterator i; - if (sse->IsComplex()) { - //cout << "Complex Entity Instance Name:" << sse->EntityName() << " ID:" - // << sse->STEPfile_id << endl; - if (sse->IsA(config_control_designe_b_spline_curve)) { - return (STEPEntity *)CreateCurveObject(sw,sse); - } else if (sse->IsA(config_control_designe_b_spline_surface)) { - return (STEPEntity *)CreateSurfaceObject(sw,sse); - } else if (sse->IsA(config_control_designe_named_unit)) { - return (STEPEntity *)CreateNamedUnitObject(sw,sse); - } else if (sse->IsA(config_control_designe_surface_curve)) { - /* - * ONEOF ( - INTERSECTION_CURVE, - SEAM_CURVE) - ANDOR - BOUNDED_SURFACE_CURVE - */ - } else if (sse->IsA(config_control_designe_topological_representation_item)) { - //loop_path; - /* - * ONEOF ( - VERTEX, - EDGE, - FACE_BOUND, - FACE, - VERTEX_SHELL, - WIRE_SHELL, - CONNECTED_EDGE_SET, - CONNECTED_FACE_SET,( - LOOP - ANDOR - PATH)) - */ - } else { - cerr << CLASSNAME << ": Error unknown complex type." << endl; - return NULL; - } + if (sse->IsComplex()) { + //cout << "Complex Entity Instance Name:" << sse->EntityName() << " ID:" + // << sse->STEPfile_id << endl; + if (sse->IsA(config_control_designe_b_spline_curve)) { + return (STEPEntity *)CreateCurveObject(sw, sse); + } else if (sse->IsA(config_control_designe_b_spline_surface)) { + return (STEPEntity *)CreateSurfaceObject(sw, sse); + } else if (sse->IsA(config_control_designe_named_unit)) { + return (STEPEntity *)CreateNamedUnitObject(sw, sse); + } else if (sse->IsA(config_control_designe_surface_curve)) { + /* + * ONEOF ( + INTERSECTION_CURVE, + SEAM_CURVE) + ANDOR + BOUNDED_SURFACE_CURVE + */ + } else if (sse->IsA(config_control_designe_topological_representation_item)) { + //loop_path; + /* + * ONEOF ( + VERTEX, + EDGE, + FACE_BOUND, + FACE, + VERTEX_SHELL, + WIRE_SHELL, + CONNECTED_EDGE_SET, + CONNECTED_FACE_SET, ( + LOOP + ANDOR + PATH)) + */ } else { - //cout << "Getting Factory Method for:" << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + cerr << CLASSNAME << ": Error unknown complex type." << endl; + return NULL; } - return f(sw, sse); // dynamic_cast<STEPEntity *>(Curve::Create(sw,sse)); + } else { + //cout << "Getting Factory Method for:" << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } + return f(sw, sse); // dynamic_cast<STEPEntity *>(Curve::Create(sw, sse)); } + STEPEntity * -Factory::CreateCurveObject(STEPWrapper *sw, SCLP23(Application_instance) *sse) { - string methodname = sse->EntityName(); - FACTORYMAP &methodmap = GetMap(); - FactoryMethod f; - FACTORYMAP::iterator i; +Factory::CreateCurveObject(STEPWrapper *sw, SCLP23(Application_instance) *sse) +{ + string methodname = sse->EntityName(); + FACTORYMAP &methodmap = GetMap(); + FactoryMethod f; + FACTORYMAP::iterator i; - if (sse->IsComplex()) { - //cout << "Complex Entity Instance Name:" << sse->EntityName() << " ID:" - // << sse->STEPfile_id << endl; - if (sse->IsA(config_control_designe_b_spline_curve)) { - if (sse->IsA(config_control_designe_rational_b_spline_curve)) { - if (sse->IsA(config_control_designe_uniform_curve)) { - methodname = "Rational_Uniform_Curve"; - //cout << " Entity of type:rational_uniform_curve" << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_quasi_uniform_curve)) { - methodname = "Rational_Quasi_Uniform_Curve"; - //cout << " Entity of type:rational_quasi_uniform_curve" << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_bezier_curve)) { - methodname = "Rational_Bezier_Curve"; - //cout << " Entity of type:rational_bezier_curve" << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_b_spline_curve_with_knots)) { - methodname = "Rational_B_Spline_Curve_With_Knots"; - //cout << " Entity of type:rational_b_spline_curve_with_knots" << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else { - cerr << "Unknown complex type for B_Spline_Curve." << endl; - return NULL; - } - } else { - // not sure if/why this would happen so error for now - cerr << CLASSNAME << ": Tagged as complex B_Spline_Curve but not complex." << endl; - return NULL; - } - } - } else { - //cout << "Getting Factory Method for:" << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { + if (sse->IsComplex()) { + //cout << "Complex Entity Instance Name:" << sse->EntityName() << " ID:" + // << sse->STEPfile_id << endl; + if (sse->IsA(config_control_designe_b_spline_curve)) { + if (sse->IsA(config_control_designe_rational_b_spline_curve)) { + if (sse->IsA(config_control_designe_uniform_curve)) { + methodname = "Rational_Uniform_Curve"; + //cout << " Entity of type:rational_uniform_curve" << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { cerr << "Factory Method not mapped: " << methodname << endl; return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_quasi_uniform_curve)) { + methodname = "Rational_Quasi_Uniform_Curve"; + //cout << " Entity of type:rational_quasi_uniform_curve" << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_bezier_curve)) { + methodname = "Rational_Bezier_Curve"; + //cout << " Entity of type:rational_bezier_curve" << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_b_spline_curve_with_knots)) { + methodname = "Rational_B_Spline_Curve_With_Knots"; + //cout << " Entity of type:rational_b_spline_curve_with_knots" << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else { + cerr << "Unknown complex type for B_Spline_Curve." << endl; + return NULL; } - f = (*i).second; + } else { + // not sure if/why this would happen so error for now + cerr << CLASSNAME << ": Tagged as complex B_Spline_Curve but not complex." << endl; + return NULL; + } } - return f(sw, sse); // dynamic_cast<STEPEntity *>(Curve::Create(sw,sse)); + } else { + //cout << "Getting Factory Method for:" << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } + return f(sw, sse); // dynamic_cast<STEPEntity *>(Curve::Create(sw, sse)); } + STEPEntity * -Factory::CreateNamedUnitObject(STEPWrapper *sw, SCLP23(Application_instance) *sse) { - string methodname = sse->EntityName(); - FACTORYMAP &methodmap = GetMap(); - FactoryMethod f; - FACTORYMAP::iterator i; +Factory::CreateNamedUnitObject(STEPWrapper *sw, SCLP23(Application_instance) *sse) +{ + string methodname = sse->EntityName(); + FACTORYMAP &methodmap = GetMap(); + FactoryMethod f; + FACTORYMAP::iterator i; - if (sse->IsComplex()) { - //cout << "Complex Entity Instance Name:" << sse->EntityName() << " ID:" - // << sse->STEPfile_id << endl; - if (sse->IsA(config_control_designe_named_unit)) { - if (sse->IsA(config_control_designe_si_unit)) { - if (sse->IsA(config_control_designe_length_unit)) { - methodname = "Length_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_mass_unit)) { - methodname = "Mass_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + if (sse->IsComplex()) { + //cout << "Complex Entity Instance Name:" << sse->EntityName() << " ID:" + // << sse->STEPfile_id << endl; + if (sse->IsA(config_control_designe_named_unit)) { + if (sse->IsA(config_control_designe_si_unit)) { + if (sse->IsA(config_control_designe_length_unit)) { + methodname = "Length_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_mass_unit)) { + methodname = "Mass_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; #ifdef AP203e - } else if (sse->IsA(config_control_designe_time_unit)) { - methodname = "Time_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_electric_current_unit)) { - methodname = "Electric_Current_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_thermodynamic_temperature_unit)) { - methodname = "Thermodynamic_Temperature_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_amount_of_substance_unit)) { - methodname = "Amount_Of_Substance_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_luminous_intensity_unit)) { - methodname = "Luminous_Intensity_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + } else if (sse->IsA(config_control_designe_time_unit)) { + methodname = "Time_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_electric_current_unit)) { + methodname = "Electric_Current_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_thermodynamic_temperature_unit)) { + methodname = "Thermodynamic_Temperature_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_amount_of_substance_unit)) { + methodname = "Amount_Of_Substance_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_luminous_intensity_unit)) { + methodname = "Luminous_Intensity_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; #endif - } else if (sse->IsA(config_control_designe_plane_angle_unit)) { - methodname = "Plane_Angle_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_solid_angle_unit)) { - methodname = "Solid_Angle_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_area_unit)) { - methodname = "Area_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_volume_unit)) { - methodname = "Volume_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + } else if (sse->IsA(config_control_designe_plane_angle_unit)) { + methodname = "Plane_Angle_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_solid_angle_unit)) { + methodname = "Solid_Angle_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_area_unit)) { + methodname = "Area_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_volume_unit)) { + methodname = "Volume_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; #ifdef AP203e - } else if (sse->IsA(config_control_designe_ratio_unit)) { - methodname = "Ratio_Si_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + } else if (sse->IsA(config_control_designe_ratio_unit)) { + methodname = "Ratio_Si_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; #endif - } else { - cerr << "Unknown complex type for SI_Named_Unit." << endl; - return NULL; - } - } else if (sse->IsA(config_control_designe_conversion_based_unit)) { - if (sse->IsA(config_control_designe_length_unit)) { - methodname = "Length_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_mass_unit)) { - methodname = "Mass_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + } else { + cerr << "Unknown complex type for SI_Named_Unit." << endl; + return NULL; + } + } else if (sse->IsA(config_control_designe_conversion_based_unit)) { + if (sse->IsA(config_control_designe_length_unit)) { + methodname = "Length_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_mass_unit)) { + methodname = "Mass_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; #ifdef AP203e - } else if (sse->IsA(config_control_designe_time_unit)) { - methodname = "Time_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_electric_current_unit)) { - methodname = "Electric_Current_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_thermodynamic_temperature_unit)) { - methodname = "Thermodynamic_Temperature_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_amount_of_substance_unit)) { - methodname = "Amount_Of_Substance_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_luminous_intensity_unit)) { - methodname = "Luminous_Intensity_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + } else if (sse->IsA(config_control_designe_time_unit)) { + methodname = "Time_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_electric_current_unit)) { + methodname = "Electric_Current_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_thermodynamic_temperature_unit)) { + methodname = "Thermodynamic_Temperature_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_amount_of_substance_unit)) { + methodname = "Amount_Of_Substance_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_luminous_intensity_unit)) { + methodname = "Luminous_Intensity_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; #endif - } else if (sse->IsA(config_control_designe_plane_angle_unit)) { - methodname = "Plane_Angle_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_solid_angle_unit)) { - methodname = "Solid_Angle_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_area_unit)) { - methodname = "Area_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_volume_unit)) { - methodname = "Volume_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + } else if (sse->IsA(config_control_designe_plane_angle_unit)) { + methodname = "Plane_Angle_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_solid_angle_unit)) { + methodname = "Solid_Angle_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_area_unit)) { + methodname = "Area_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_volume_unit)) { + methodname = "Volume_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; #ifdef AP203e - } else if (sse->IsA(config_control_designe_ratio_unit)) { - methodname = "Ratio_Conversion_Based_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + } else if (sse->IsA(config_control_designe_ratio_unit)) { + methodname = "Ratio_Conversion_Based_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; #endif - } else { - cerr << "Unknown complex type for Conversion_Based_Named_Unit." << endl; - return NULL; - } - } else if (sse->IsA(config_control_designe_context_dependent_unit)) { - if (sse->IsA(config_control_designe_length_unit)) { - methodname = "Length_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_mass_unit)) { - methodname = "Mass_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + } else { + cerr << "Unknown complex type for Conversion_Based_Named_Unit." << endl; + return NULL; + } + } else if (sse->IsA(config_control_designe_context_dependent_unit)) { + if (sse->IsA(config_control_designe_length_unit)) { + methodname = "Length_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_mass_unit)) { + methodname = "Mass_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; #ifdef AP203e - } else if (sse->IsA(config_control_designe_time_unit)) { - methodname = "Time_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_electric_current_unit)) { - methodname = "Electric_Current_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_thermodynamic_temperature_unit)) { - methodname = "Thermodynamic_Temperature_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_amount_of_substance_unit)) { - methodname = "Amount_Of_Substance_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_luminous_intensity_unit)) { - methodname = "Luminous_Intensity_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + } else if (sse->IsA(config_control_designe_time_unit)) { + methodname = "Time_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_electric_current_unit)) { + methodname = "Electric_Current_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_thermodynamic_temperature_unit)) { + methodname = "Thermodynamic_Temperature_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_amount_of_substance_unit)) { + methodname = "Amount_Of_Substance_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_luminous_intensity_unit)) { + methodname = "Luminous_Intensity_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; #endif - } else if (sse->IsA(config_control_designe_plane_angle_unit)) { - methodname = "Plane_Angle_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_solid_angle_unit)) { - methodname = "Solid_Angle_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_area_unit)) { - methodname = "Area_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_volume_unit)) { - methodname = "Volume_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; + } else if (sse->IsA(config_control_designe_plane_angle_unit)) { + methodname = "Plane_Angle_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_solid_angle_unit)) { + methodname = "Solid_Angle_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_area_unit)) { + methodname = "Area_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_volume_unit)) { + methodname = "Volume_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; #ifdef AP203e - } else if (sse->IsA(config_control_designe_ratio_unit)) { - methodname = "Ratio_Context_Dependent_Unit"; - //cout << " Entity of type: " << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; -#endif - } else { - cerr << "Unknown complex type for Context_Dependent_Named_Unit." << endl; - return NULL; - } - } else { - // not sure if/why this would happen so error for now - cerr << CLASSNAME << ": Tagged as complex Named_Unit but not complex." << endl; - return NULL; - } - } - } else { - //cout << "Getting Factory Method for:" << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { + } else if (sse->IsA(config_control_designe_ratio_unit)) { + methodname = "Ratio_Context_Dependent_Unit"; + //cout << " Entity of type: " << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { cerr << "Factory Method not mapped: " << methodname << endl; return NULL; + } + f = (*i).second; +#endif + } else { + cerr << "Unknown complex type for Context_Dependent_Named_Unit." << endl; + return NULL; } - f = (*i).second; + } else { + // not sure if/why this would happen so error for now + cerr << CLASSNAME << ": Tagged as complex Named_Unit but not complex." << endl; + return NULL; + } } - return f(sw, sse); // dynamic_cast<STEPEntity *>(Curve::Create(sw,sse)); + } else { + //cout << "Getting Factory Method for:" << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } + return f(sw, sse); // dynamic_cast<STEPEntity *>(Curve::Create(sw, sse)); } + STEPEntity * -Factory::CreateSurfaceObject(STEPWrapper *sw, SCLP23(Application_instance) *sse) { - string methodname = sse->EntityName(); - FACTORYMAP &methodmap = GetMap(); - FactoryMethod f; - FACTORYMAP::iterator i; +Factory::CreateSurfaceObject(STEPWrapper *sw, SCLP23(Application_instance) *sse) +{ + string methodname = sse->EntityName(); + FACTORYMAP &methodmap = GetMap(); + FactoryMethod f; + FACTORYMAP::iterator i; - if (sse->IsComplex()) { - //cout << "Complex Entity Instance Name:" << sse->EntityName() << " ID:" - // << sse->STEPfile_id << endl; - if (sse->IsA(config_control_designe_b_spline_surface)) { - if (sse->IsA(config_control_designe_rational_b_spline_surface)) { - if (sse->IsA(config_control_designe_uniform_surface)) { - methodname = "Rational_Uniform_Surface"; - //cout << " Entity of type:rational_uniform_surface" << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_quasi_uniform_surface)) { - methodname = "Rational_Quasi_Uniform_Surface"; - //cout << " Entity of type:rational_quasi_uniform_surface" << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_bezier_surface)) { - methodname = "Rational_Bezier_Surface"; - //cout << " Entity of type:rational_bezier_surface" << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else if (sse->IsA(config_control_designe_b_spline_surface_with_knots)) { - methodname = "Rational_B_Spline_Surface_With_Knots"; - //cout << " Entity of type:rational_b_spline_surface_with_knots" << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - cerr << "Factory Method not mapped: " << methodname << endl; - return NULL; - } - f = (*i).second; - } else { - cerr << "Unknown complex type for B_Spline_Surface." << endl; - return NULL; - } - } else { - // not sure if/why this would happen so error for now - cerr << CLASSNAME << ": Tagged as complex B_Spline_Surface but not complex." << endl; - return NULL; - } - } - } else { - //cout << "Getting Factory Method for:" << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { + if (sse->IsComplex()) { + //cout << "Complex Entity Instance Name:" << sse->EntityName() << " ID:" + // << sse->STEPfile_id << endl; + if (sse->IsA(config_control_designe_b_spline_surface)) { + if (sse->IsA(config_control_designe_rational_b_spline_surface)) { + if (sse->IsA(config_control_designe_uniform_surface)) { + methodname = "Rational_Uniform_Surface"; + //cout << " Entity of type:rational_uniform_surface" << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { cerr << "Factory Method not mapped: " << methodname << endl; return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_quasi_uniform_surface)) { + methodname = "Rational_Quasi_Uniform_Surface"; + //cout << " Entity of type:rational_quasi_uniform_surface" << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_bezier_surface)) { + methodname = "Rational_Bezier_Surface"; + //cout << " Entity of type:rational_bezier_surface" << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else if (sse->IsA(config_control_designe_b_spline_surface_with_knots)) { + methodname = "Rational_B_Spline_Surface_With_Knots"; + //cout << " Entity of type:rational_b_spline_surface_with_knots" << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } else { + cerr << "Unknown complex type for B_Spline_Surface." << endl; + return NULL; } - f = (*i).second; + } else { + // not sure if/why this would happen so error for now + cerr << CLASSNAME << ": Tagged as complex B_Spline_Surface but not complex." << endl; + return NULL; + } } - return f(sw, sse); + } else { + //cout << "Getting Factory Method for:" << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + cerr << "Factory Method not mapped: " << methodname << endl; + return NULL; + } + f = (*i).second; + } + return f(sw, sse); } -string Factory::RegisterClass(string methodname, FactoryMethod f) { - FACTORYMAP &methodmap = GetMap(); - FACTORYMAP::iterator i; - //cout << "Adding Factory Method:" << methodname << endl; - if ((i = methodmap.find(methodname)) == methodmap.end()) { - methodmap[methodname] = f; - } else { - cerr << "Factory Method already mapped: " << methodname << endl; - } - return methodname; +string Factory::RegisterClass(string methodname, FactoryMethod f) +{ + FACTORYMAP &methodmap = GetMap(); + + FACTORYMAP::iterator i; + //cout << "Adding Factory Method:" << methodname << endl; + if ((i = methodmap.find(methodname)) == methodmap.end()) { + methodmap[methodname] = f; + } else { + cerr << "Factory Method already mapped: " << methodname << endl; + } + return methodname; } -void Factory::DeleteObjects() { - OBJECTS::iterator i = objects.begin(); +void Factory::DeleteObjects() +{ + OBJECTS::iterator i = objects.begin(); - while(i != objects.end()) { - delete (*i).second; - objects.erase((*i).first); - i=objects.begin(); - } - UNMAPPED_OBJECTS::iterator j = unmapped_objects.begin(); + while (i != objects.end()) { + delete (*i).second; + objects.erase((*i).first); + i=objects.begin(); + } + UNMAPPED_OBJECTS::iterator j = unmapped_objects.begin(); - while(j != unmapped_objects.end()) { - delete (*j); - j = unmapped_objects.erase(j); - } + while (j != unmapped_objects.end()) { + delete (*j); + j = unmapped_objects.erase(j); + } } Factory::OBJECTS::iterator Factory::FindObject(int id) { - Factory::OBJECTS::iterator i = objects.end(); - if (id > 0) { - i = objects.find(id); - } - return i; + Factory::OBJECTS::iterator i = objects.end(); + if (id > 0) { + i = objects.find(id); + } + return i; } + void Factory::AddObject(STEPEntity *se) { - if (se->STEPid() > 0) { - objects[se->STEPid()] = se; - } else { - unmapped_objects.push_back(se); - } + if (se->STEPid() > 0) { + objects[se->STEPid()] = se; + } else { + unmapped_objects.push_back(se); + } } + void Factory::AddVertex(STEPEntity *se) { - AddObject(se); - if (se->STEPid() > 0) { - vertices.insert(vertices.begin() + vertex_count,se); - vertex_to_index[se->STEPid()] = vertex_count; - vertex_index_to_id[vertex_count++] = se->STEPid(); - } else { - cerr << "Warning: Factory::AddVertex(...) - Vertex with unmappable ID." << endl; - } + AddObject(se); + if (se->STEPid() > 0) { + vertices.insert(vertices.begin() + vertex_count, se); + vertex_to_index[se->STEPid()] = vertex_count; + vertex_index_to_id[vertex_count++] = se->STEPid(); + } else { + cerr << "Warning: Factory::AddVertex(...) - Vertex with unmappable ID." << endl; + } } + VECTOR_OF_OBJECTS * Factory::GetVertices() { - return &vertices; + return &vertices; } int Factory::GetVertexIndex(int id) { - return vertex_to_index[id]; + return vertex_to_index[id]; } + STEPEntity * Factory::GetVertexByIndex(int index) { - return objects[vertex_index_to_id[index]]; + return objects[vertex_index_to_id[index]]; } + // Local Variables: // tab-width: 8 // mode: C++ Modified: brlcad/trunk/src/conv/step/Factory.h =================================================================== --- brlcad/trunk/src/conv/step/Factory.h 2009-12-22 15:48:11 UTC (rev 36979) +++ brlcad/trunk/src/conv/step/Factory.h 2009-12-22 15:55:11 UTC (rev 36980) @@ -26,50 +26,63 @@ #ifndef FACTORY_H_ #define FACTORY_H_ +#include "common.h" + +/* system interface headers */ +#include <map> +#include <list> +#include <vector> +#include <string> + +/* inteface headers */ +#include "sclprefixes.h" + + class STEPEntity; -typedef STEPEntity* (*FactoryMethod)(STEPWrapper*,SCLP23(Application_instance)*); -typedef std::map<std::string,FactoryMethod> FACTORYMAP; -typedef vector<STEPEntity *> VECTOR_OF_OBJECTS; +typedef STEPEntity* (*FactoryMethod)(STEPWrapper*, SCLP23(Application_instance)*); +typedef std::map<std::string, FactoryMethod> FACTORYMAP; +typedef std::vector<STEPEntity *> VECTOR_OF_OBJECTS; class Factory { -public: - typedef map<int,STEPEntity *> OBJECTS; - typedef map<int,int> ID_TO_INDEX_MAP; - typedef map<int,int> INDEX_TO_ID_MAP; - typedef list<STEPEntity *> UNMAPPED_OBJECTS; - static OBJECTS objects; - static UNMAPPED_OBJECTS unmapped_objects; + public: + typedef std::map<int, STEPEntity *> OBJECTS; + typedef std::map<int, int> ID_TO_INDEX_MAP; + typedef std::map<int, int> INDEX_TO_ID_MAP; + typedef std::list<STEPEntity *> UNMAPPED_OBJECTS; + static OBJECTS objects; + static UNMAPPED_OBJECTS unmapped_objects; - static int vertex_count; - static VECTOR_OF_OBJECTS vertices; - static ID_TO_INDEX_MAP vertex_to_index; - static INDEX_TO_ID_MAP vertex_index_to_id; + static int vertex_count; + static VECTOR_OF_OBJECTS vertices; + static ID_TO_INDEX_MAP vertex_to_index; + static INDEX_TO_ID_MAP vertex_index_to_id; -protected: - Factory(); + protected: + Factory(); -private: - static STEPEntity *CreateCurveObject(STEPWrapper *sw,SCLP23(Application_instance) *sse); - static STEPEntity *CreateSurfaceObject(STEPWrapper *sw,SCLP23(Application_instance) *sse); - static STEPEntity *CreateNamedUnitObject(STEPWrapper *sw,SCLP23(Application_instance) *sse); + private: + static STEPEntity *CreateCurveObject(STEPWrapper *sw, SCLP23(Application_instance) *sse); + static STEPEntity *CreateSurfaceObject(STEPWrapper *sw, SCLP23(Application_instance) *sse); + static STEPEntity *CreateNamedUnitObject(STEPWrapper *sw, SCLP23(Application_instance) *sse); -public: - static const char *factoryname; - virtual ~Factory(); - static STEPEntity *CreateObject(STEPWrapper *sw,SCLP23(Application_instance) *sse); - static FACTORYMAP &GetMap(); - static void Print(); - static string RegisterClass(string name, FactoryMethod f); - static void DeleteObjects(); - static OBJECTS::iterator FindObject(int id); - static void AddObject(STEPEntity *se); - static void AddVertex(STEPEntity *se); - static VECTOR_OF_OBJECTS *GetVertices(); - static int GetVertexIndex(int id); - static STEPEntity *GetVertexByIndex(int index); + public: + static const char *factoryname; + virtual ~Factory(); + static STEPEntity *CreateObject(STEPWrapper *sw, SCLP23(Application_instance) *sse); + static FACTORYMAP &GetMap(); + static void Print(); + static std::string RegisterClass(std::string name, FactoryMethod f); + static void DeleteObjects(); + static OBJECTS::iterator FindObject(int id); + static void AddObject(STEPEntity *se); + static void AddVertex(STEPEntity *se); + static VECTOR_OF_OBJECTS *GetVertices(); + static int GetVertexIndex(int id); + static STEPEntity *GetVertexByIndex(int index); }; + #endif /* FACTORY_H_ */ /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-12-22 16:03:19
|
Revision: 36981 http://brlcad.svn.sourceforge.net/brlcad/?rev=36981&view=rev Author: brlcad Date: 2009-12-22 16:03:06 +0000 (Tue, 22 Dec 2009) Log Message: ----------- oops, already had forward decl on STEPEntity. only needed for the implementation. Modified Paths: -------------- brlcad/trunk/src/conv/step/Factory.cpp brlcad/trunk/src/conv/step/Factory.h Modified: brlcad/trunk/src/conv/step/Factory.cpp =================================================================== --- brlcad/trunk/src/conv/step/Factory.cpp 2009-12-22 15:55:11 UTC (rev 36980) +++ brlcad/trunk/src/conv/step/Factory.cpp 2009-12-22 16:03:06 UTC (rev 36981) @@ -27,7 +27,6 @@ #include "Factory.h" /* implementation headers */ -#include "STEPWrapper.h" #include "STEPEntity.h" Modified: brlcad/trunk/src/conv/step/Factory.h =================================================================== --- brlcad/trunk/src/conv/step/Factory.h 2009-12-22 15:55:11 UTC (rev 36980) +++ brlcad/trunk/src/conv/step/Factory.h 2009-12-22 16:03:06 UTC (rev 36981) @@ -35,6 +35,7 @@ #include <string> /* inteface headers */ +#include "STEPWrapper.h" #include "sclprefixes.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2009-12-22 16:34:35
|
Revision: 36983 http://brlcad.svn.sourceforge.net/brlcad/?rev=36983&view=rev Author: brlcad Date: 2009-12-22 16:34:23 +0000 (Tue, 22 Dec 2009) Log Message: ----------- more brlcad namespace qualifications, cleanup ws indent and brace formatting Modified Paths: -------------- brlcad/trunk/src/conv/step/PullbackCurve.cpp brlcad/trunk/src/conv/step/PullbackCurve.h Modified: brlcad/trunk/src/conv/step/PullbackCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-12-22 16:07:09 UTC (rev 36982) +++ brlcad/trunk/src/conv/step/PullbackCurve.cpp 2009-12-22 16:34:23 UTC (rev 36983) @@ -40,25 +40,25 @@ #include "PullbackCurve.h" -using namespace std; -using namespace brlcad; #define RANGE_HI 0.55 #define RANGE_LO 0.45 #define UNIVERSAL_SAMPLE_COUNT 1001 -typedef struct _bspline { - int p; // degree - int m; // num_knots-1 - int n; // num_samples-1 (aka number of control points) - vector<double> params; - vector<double> knots; - ON_2dPointArray controls; +typedef struct _bspline +{ + int p; // degree + int m; // num_knots-1 + int n; // num_samples-1 (aka number of control points) + vector<double> params; + vector<double> knots; + ON_2dPointArray controls; } BSpline; -class plane_ray { +class plane_ray +{ public: vect_t n1; fastf_t d1; @@ -67,12 +67,15 @@ fastf_t d2; }; + bool -isFlat(const ON_2dPoint& p1, const ON_2dPoint& m, const ON_2dPoint& p2, double flatness) { - ON_Line line = ON_Line(ON_3dPoint(p1), ON_3dPoint(p2)); - return line.DistanceTo(ON_3dPoint(m)) <= flatness; +isFlat(const ON_2dPoint& p1, const ON_2dPoint& m, const ON_2dPoint& p2, double flatness) +{ + ON_Line line = ON_Line(ON_3dPoint(p1), ON_3dPoint(p2)); + return line.DistanceTo(ON_3dPoint(m)) <= flatness; } + void brep_get_plane_ray(ON_Ray& r, plane_ray& pr) { @@ -97,20 +100,21 @@ TRACE1("n1:" << ON_PRINT3(pr.n1) << " n2:" << ON_PRINT3(pr.n2) << " d1:" << pr.d1 << " d2:" << pr.d2); } + void brep_r(const ON_Surface* surf, plane_ray& pr, pt2d_t uv, ON_3dPoint& pt, ON_3dVector& su, ON_3dVector& sv, pt2d_t R) { assert(surf->Ev1Der(uv[0], uv[1], pt, su, sv)); - R[0] = VDOT(pr.n1,((fastf_t*)pt)) - pr.d1; - R[1] = VDOT(pr.n2,((fastf_t*)pt)) - pr.d2; + R[0] = VDOT(pr.n1, ((fastf_t*)pt)) - pr.d1; + R[1] = VDOT(pr.n2, ((fastf_t*)pt)) - pr.d2; } void brep_newton_iterate(const ON_Surface* surf, plane_ray& pr, pt2d_t R, ON_3dVector& su, ON_3dVector& sv, pt2d_t uv, pt2d_t out_uv) { - mat2d_t jacob = { VDOT(pr.n1,((fastf_t*)su)), VDOT(pr.n1,((fastf_t*)sv)), - VDOT(pr.n2,((fastf_t*)su)), VDOT(pr.n2,((fastf_t*)sv)) }; + mat2d_t jacob = { VDOT(pr.n1, ((fastf_t*)su)), VDOT(pr.n1, ((fastf_t*)sv)), + VDOT(pr.n2, ((fastf_t*)su)), VDOT(pr.n2, ((fastf_t*)sv)) }; mat2d_t inv_jacob; if (mat2d_inverse(inv_jacob, jacob)) { // check inverse validity @@ -123,6 +127,7 @@ } } + void utah_ray_planes(const ON_Ray &r, ON_3dVector &p1, double &p1d, ON_3dVector &p2, double &p2d) { @@ -143,173 +148,178 @@ p1 = ON_3dVector(rdy, -rdx, 0); else p1 = ON_3dVector(0, rdz, -rdy); - p1.Unitize(); + p1.Unitize(); p2 = ON_CrossProduct(p1, rdir); p1d = -(p1 * ro); p2d = -(p2 * ro); } + + enum seam_direction -seam_direction(ON_2dPoint uv1,ON_2dPoint uv2) { - if (NEAR_EQUAL(uv1.x,0.0,PBC_TOL) && NEAR_EQUAL(uv2.x,0.0,PBC_TOL)) { - //cout << "West" << endl; +seam_direction(ON_2dPoint uv1, ON_2dPoint uv2) +{ + if (NEAR_EQUAL(uv1.x, 0.0, PBC_TOL) && NEAR_EQUAL(uv2.x, 0.0, PBC_TOL)) { return WEST_SEAM; - } else if (NEAR_EQUAL(uv1.x,1.0,PBC_TOL) && NEAR_EQUAL(uv2.x,1.0,PBC_TOL)) { - //cout << "East" << endl; + } else if (NEAR_EQUAL(uv1.x, 1.0, PBC_TOL) && NEAR_EQUAL(uv2.x, 1.0, PBC_TOL)) { return EAST_SEAM; - } else if (NEAR_EQUAL(uv1.y,0.0,PBC_TOL) && NEAR_EQUAL(uv2.y,0.0,PBC_TOL)) { - //cout << "South" << endl; + } else if (NEAR_EQUAL(uv1.y, 0.0, PBC_TOL) && NEAR_EQUAL(uv2.y, 0.0, PBC_TOL)) { return SOUTH_SEAM; - } else if (NEAR_EQUAL(uv1.y,1.0,PBC_TOL) && NEAR_EQUAL(uv2.y,1.0,PBC_TOL)) { - //cout << "North" << endl; + } else if (NEAR_EQUAL(uv1.y, 1.0, PBC_TOL) && NEAR_EQUAL(uv2.y, 1.0, PBC_TOL)) { return NORTH_SEAM; } else { - //cout << "What the???" << endl; return UNKNOWN_SEAM_DIRECTION; } } + bool -toUV(PBCData& data, ON_2dPoint& out_pt, double t, double knudge=0.0) { - ON_3dPoint pointOnCurve = data.curve->PointAt(t); - ON_3dPoint knudgedPointOnCurve = data.curve->PointAt(t+knudge); +toUV(PBCData& data, ON_2dPoint& out_pt, double t, double knudge=0.0) +{ + ON_3dPoint pointOnCurve = data.curve->PointAt(t); + ON_3dPoint knudgedPointOnCurve = data.curve->PointAt(t+knudge); - ON_2dPoint uv; - if ( data.surftree->getSurfacePoint((const ON_3dPoint&)pointOnCurve,uv,(const ON_3dPoint&)knudgedPointOnCurve,BREP_EDGE_MISS_TOLERANCE) > 0 ) { - out_pt.Set(uv.x,uv.y); - return true; - } else { - return false; - } + ON_2dPoint uv; + if (data.surftree->getSurfacePoint((const ON_3dPoint&)pointOnCurve, uv, (const ON_3dPoint&)knudgedPointOnCurve, BREP_EDGE_MISS_TOLERANCE) > 0) { + out_pt.Set(uv.x, uv.y); + return true; + } else { + return false; + } - ON_3dVector dt; - data.curve->Ev1Der(t,pointOnCurve,dt); - ON_3dVector tangent = data.curve->TangentAt(t); - //data.surf->GetClosestPoint(pointOnCurve,&a,&b,0.0001); - ON_Ray r(pointOnCurve,tangent); - plane_ray pr; - brep_get_plane_ray(r,pr); - ON_3dVector p1; - double p1d; - ON_3dVector p2; - double p2d; + ON_3dVector dt; + data.curve->Ev1Der(t, pointOnCurve, dt); + ON_3dVector tangent = data.curve->TangentAt(t); + //data.surf->GetClosestPoint(pointOnCurve, &a, &b, 0.0001); + ON_Ray r(pointOnCurve, tangent); + plane_ray pr; + brep_get_plane_ray(r, pr); + ON_3dVector p1; + double p1d; + ON_3dVector p2; + double p2d; - utah_ray_planes(r,p1, p1d, p2, p2d); + utah_ray_planes(r, p1, p1d, p2, p2d); - VMOVE(pr.n1,p1); - pr.d1 = p1d; - VMOVE(pr.n2,p2); - pr.d2 = p2d; + VMOVE(pr.n1, p1); + pr.d1 = p1d; + VMOVE(pr.n2, p2); + pr.d2 = p2d; - try { - const ON_Surface *surf = data.surftree->getSurface(); - ON_2dPoint uv = data.surftree->getClosestPointEstimate(knudgedPointOnCurve); - ON_3dVector dir = surf->NormalAt(uv.x,uv.y); - dir.Reverse(); - ON_Ray ray(pointOnCurve,dir); - brep_get_plane_ray(ray,pr); - //now use this as guess to iterate to closer solution - pt2d_t Rcurr; - pt2d_t new_uv; - ON_3dPoint pt; - ON_3dVector su,sv; - bool found=false; - fastf_t Dlast = MAX_FASTF; - for (int i = 0; i < 10; i++) { - brep_r(surf, pr, uv, pt, su, sv, Rcurr); - fastf_t d = v2mag(Rcurr); - if (d < BREP_INTERSECTION_ROOT_EPSILON) { - TRACE1("R:"<<ON_PRINT2(Rcurr)); - found = true; break; - } else if (d > Dlast) { - found = false; //break; + try { + const ON_Surface *surf = data.surftree->getSurface(); + ON_2dPoint uv = data.surftree->getClosestPointEstimate(knudgedPointOnCurve); + ON_3dVector dir = surf->NormalAt(uv.x, uv.y); + dir.Reverse(); + ON_Ray ray(pointOnCurve, dir); + brep_get_plane_ray(ray, pr); + //now use this as guess to iterate to closer solution + pt2d_t Rcurr; + pt2d_t new_uv; + ON_3dPoint pt; + ON_3dVector su, sv; + bool found=false; + fastf_t Dlast = MAX_FASTF; + for (int i = 0; i < 10; i++) { + brep_r(surf, pr, uv, pt, su, sv, Rcurr); + fastf_t d = v2mag(Rcurr); + if (d < BREP_INTERSECTION_ROOT_EPSILON) { + TRACE1("R:"<<ON_PRINT2(Rcurr)); + found = true; break; + } else if (d > Dlast) { + found = false; //break; break; - //return brep_edge_check(found, sbv, face, surf, ray, hits); + //return brep_edge_check(found, sbv, face, surf, ray, hits); + } + brep_newton_iterate(surf, pr, Rcurr, su, sv, uv, new_uv); + move(uv, new_uv); + Dlast = d; } - brep_newton_iterate(surf, pr, Rcurr, su, sv, uv, new_uv); - move(uv, new_uv); - Dlast = d; - } /////////////////////////////////////// - out_pt.Set(uv.x,uv.y); - return true; - } catch(...) { - return false; - } + out_pt.Set(uv.x, uv.y); + return true; + } catch(...) { + return false; + } } + + bool -toUV(SurfaceTree *surftree, const ON_Curve *curve, ON_2dPoint& out_pt, double t, double knudge=0.0) { - const ON_Surface *surf = surftree->getSurface(); - ON_3dPoint pointOnCurve = curve->PointAt(t); - ON_3dPoint knudgedPointOnCurve = curve->PointAt(t+knudge); - ON_3dVector dt; - curve->Ev1Der(t,pointOnCurve,dt); - ON_3dVector tangent = curve->TangentAt(t); - //data.surf->GetClosestPoint(pointOnCurve,&a,&b,0.0001); - ON_Ray r(pointOnCurve,tangent); - plane_ray pr; - brep_get_plane_ray(r,pr); - ON_3dVector p1; - double p1d; - ON_3dVector p2; - double p2d; +toUV(brlcad::SurfaceTree *surftree, const ON_Curve *curve, ON_2dPoint& out_pt, double t, double knudge=0.0) +{ + const ON_Surface *surf = surftree->getSurface(); + ON_3dPoint pointOnCurve = curve->PointAt(t); + ON_3dPoint knudgedPointOnCurve = curve->PointAt(t+knudge); + ON_3dVector dt; + curve->Ev1Der(t, pointOnCurve, dt); + ON_3dVector tangent = curve->TangentAt(t); + //data.surf->GetClosestPoint(pointOnCurve, &a, &b, 0.0001); + ON_Ray r(pointOnCurve, tangent); + plane_ray pr; + brep_get_plane_ray(r, pr); + ON_3dVector p1; + double p1d; + ON_3dVector p2; + double p2d; - utah_ray_planes(r,p1, p1d, p2, p2d); + utah_ray_planes(r, p1, p1d, p2, p2d); - VMOVE(pr.n1,p1); - pr.d1 = p1d; - VMOVE(pr.n2,p2); - pr.d2 = p2d; + VMOVE(pr.n1, p1); + pr.d1 = p1d; + VMOVE(pr.n2, p2); + pr.d2 = p2d; - try { - ON_2dPoint uv = surftree->getClosestPointEstimate(knudgedPointOnCurve); - ON_3dVector dir = surf->NormalAt(uv.x,uv.y); - dir.Reverse(); - ON_Ray ray(pointOnCurve,dir); - brep_get_plane_ray(ray,pr); - //know use this as guess to iterate to closer solution - pt2d_t Rcurr; - pt2d_t new_uv; - ON_3dPoint pt; - ON_3dVector su,sv; - bool found=false; - fastf_t Dlast = MAX_FASTF; - for (int i = 0; i < 10; i++) { - brep_r(surf, pr, uv, pt, su, sv, Rcurr); - fastf_t d = v2mag(Rcurr); - if (d < BREP_INTERSECTION_ROOT_EPSILON) { - TRACE1("R:"<<ON_PRINT2(Rcurr)); - found = true; break; - } else if (d > Dlast) { - found = false; //break; + try { + ON_2dPoint uv = surftree->getClosestPointEstimate(knudgedPointOnCurve); + ON_3dVector dir = surf->NormalAt(uv.x, uv.y); + dir.Reverse(); + ON_Ray ray(pointOnCurve, dir); + brep_get_plane_ray(ray, pr); + //know use this as guess to iterate to closer solution + pt2d_t Rcurr; + pt2d_t new_uv; + ON_3dPoint pt; + ON_3dVector su, sv; + bool found=false; + fastf_t Dlast = MAX_FASTF; + for (int i = 0; i < 10; i++) { + brep_r(surf, pr, uv, pt, su, sv, Rcurr); + fastf_t d = v2mag(Rcurr); + if (d < BREP_INTERSECTION_ROOT_EPSILON) { + TRACE1("R:"<<ON_PRINT2(Rcurr)); + found = true; break; + } else if (d > Dlast) { + found = false; //break; break; - //return brep_edge_check(found, sbv, face, surf, ray, hits); + //return brep_edge_check(found, sbv, face, surf, ray, hits); + } + brep_newton_iterate(surf, pr, Rcurr, su, sv, uv, new_uv); + move(uv, new_uv); + Dlast = d; } - brep_newton_iterate(surf, pr, Rcurr, su, sv, uv, new_uv); - move(uv, new_uv); - Dlast = d; - } /////////////////////////////////////// - out_pt.Set(uv.x,uv.y); - return true; - } catch(...) { - return false; - } + out_pt.Set(uv.x, uv.y); + return true; + } catch(...) { + return false; + } } + double randomPointFromRange(PBCData& data, ON_2dPoint& out, double lo, double hi) { - assert(lo < hi); - double random_pos = drand48() * (RANGE_HI - RANGE_LO) + RANGE_LO; - double newt = random_pos * (hi - lo) + lo; - assert(toUV(data, out, newt)); - return newt; + assert(lo < hi); + double random_pos = drand48() * (RANGE_HI - RANGE_LO) + RANGE_LO; + double newt = random_pos * (hi - lo) + lo; + assert(toUV(data, out, newt)); + return newt; } + bool sample(PBCData& data, double t1, @@ -317,223 +327,236 @@ const ON_2dPoint& p1, const ON_2dPoint& p2) { - ON_2dPoint m; - double t = randomPointFromRange(data, m, t1, t2); - ON_2dPointArray * samples = (*data.segments.end()); - if (isFlat(p1, m, p2, data.flatness)) { - samples->Append(p2); - } else { - sample(data, t1, t, p1, m); - sample(data, t, t2, m, p2); - } - return true; + ON_2dPoint m; + double t = randomPointFromRange(data, m, t1, t2); + ON_2dPointArray * samples = (*data.segments.end()); + if (isFlat(p1, m, p2, data.flatness)) { + samples->Append(p2); + } else { + sample(data, t1, t, p1, m); + sample(data, t, t2, m, p2); + } + return true; } + void -generateKnots(BSpline& bspline) { - int num_knots = bspline.m + 1; - bspline.knots.resize(num_knots); - //cout << "knot size:" << bspline.knots.size() << endl; - for (int i = 0; i <= bspline.p; i++) { - bspline.knots[i] = 0.0; - } - for (int i = bspline.m-bspline.p; i <= bspline.m; i++) { - bspline.knots[i] = 1.0; - } - for (int i = 1; i <= bspline.n-bspline.p; i++) { - bspline.knots[bspline.p+i] = (double)i / (bspline.n-bspline.p+1.0); - } - //cout << "knot size:" << bspline.knots.size() << endl; +generateKnots(BSpline& bspline) +{ + int num_knots = bspline.m + 1; + bspline.knots.resize(num_knots); + for (int i = 0; i <= bspline.p; i++) { + bspline.knots[i] = 0.0; + } + for (int i = bspline.m-bspline.p; i <= bspline.m; i++) { + bspline.knots[i] = 1.0; + } + for (int i = 1; i <= bspline.n-bspline.p; i++) { + bspline.knots[bspline.p+i] = (double)i / (bspline.n-bspline.p+1.0); + } } + int -getKnotInterval(BSpline& bspline, double u) { - int k = 0; - while (u >= bspline.knots[k]) k++; - k = (k == 0) ? k : k-1; - return k; +getKnotInterval(BSpline& bspline, double u) +{ + int k = 0; + while (u >= bspline.knots[k]) k++; + k = (k == 0) ? k : k-1; + return k; } + int -getCoefficients(BSpline& bspline, Array1D<double>& N, double u) { - // evaluate the b-spline basis function for the given parameter u - // place the results in N[] - N = 0.0; - if (u == bspline.knots[0]) { - N[0] = 1.0; - return 0; - } else if (u == bspline.knots[bspline.m]) { - N[bspline.n] = 1.0; - return bspline.n; - } - int k = getKnotInterval(bspline, u); - N[k] = 1.0; - for (int d = 1; d <= bspline.p; d++) { - double uk_1 = bspline.knots[k+1]; - double uk_d_1 = bspline.knots[k-d+1]; - N[k-d] = ((uk_1 - u)/(uk_1 - uk_d_1)) * N[k-d+1]; - for (int i = k-d+1; i <= k-1; i++) { - double ui = bspline.knots[i]; - double ui_1 = bspline.knots[i+1]; - double ui_d = bspline.knots[i+d]; - double ui_d_1 = bspline.knots[i+d+1]; - N[i] = ((u - ui)/(ui_d - ui)) * N[i] + ((ui_d_1 - u)/(ui_d_1 - ui_1))*N[i+1]; +getCoefficients(BSpline& bspline, Array1D<double>& N, double u) +{ + // evaluate the b-spline basis function for the given parameter u + // place the results in N[] + N = 0.0; + if (u == bspline.knots[0]) { + N[0] = 1.0; + return 0; + } else if (u == bspline.knots[bspline.m]) { + N[bspline.n] = 1.0; + return bspline.n; } - double uk = bspline.knots[k]; - double uk_d = bspline.knots[k+d]; - N[k] = ((u - uk)/(uk_d - uk)) * N[k]; - } - return k; + int k = getKnotInterval(bspline, u); + N[k] = 1.0; + for (int d = 1; d <= bspline.p; d++) { + double uk_1 = bspline.knots[k+1]; + double uk_d_1 = bspline.knots[k-d+1]; + N[k-d] = ((uk_1 - u)/(uk_1 - uk_d_1)) * N[k-d+1]; + for (int i = k-d+1; i <= k-1; i++) { + double ui = bspline.knots[i]; + double ui_1 = bspline.knots[i+1]; + double ui_d = bspline.knots[i+d]; + double ui_d_1 = bspline.knots[i+d+1]; + N[i] = ((u - ui)/(ui_d - ui)) * N[i] + ((ui_d_1 - u)/(ui_d_1 - ui_1))*N[i+1]; + } + double uk = bspline.knots[k]; + double uk_d = bspline.knots[k+d]; + N[k] = ((u - uk)/(uk_d - uk)) * N[k]; + } + return k; } + void printMatrix(Array1D<double>& m) { - printf("---\n"); - for (int i = 0; i < m.dim1(); i++) { - printf("% 5.5f ", m[i]); - } - printf("\n"); + printf("---\n"); + for (int i = 0; i < m.dim1(); i++) { + printf("% 5.5f ", m[i]); + } + printf("\n"); } + // XXX: this function sucks... -void generateParameters(BSpline& bspline) { - double lastT = 0.0; - bspline.params.resize(bspline.n + 1); - Array2D<double> N(UNIVERSAL_SAMPLE_COUNT, bspline.n + 1); - for (int i = 0; i < UNIVERSAL_SAMPLE_COUNT; i++) { - double t = (double) i / (UNIVERSAL_SAMPLE_COUNT - 1); - Array1D<double> n = Array1D<double> (N.dim2(), N[i]); - getCoefficients(bspline, n, t); - //printMatrix(n); - } +void +generateParameters(BSpline& bspline) +{ + double lastT = 0.0; + bspline.params.resize(bspline.n + 1); + Array2D<double> N(UNIVERSAL_SAMPLE_COUNT, bspline.n + 1); + for (int i = 0; i < UNIVERSAL_SAMPLE_COUNT; i++) { + double t = (double) i / (UNIVERSAL_SAMPLE_COUNT - 1); + Array1D<double> n = Array1D<double> (N.dim2(), N[i]); + getCoefficients(bspline, n, t); + //printMatrix(n); + } - for (int i = 0; i < bspline.n + 1; i++) { - double max = 0.0; //real.min(); - for (int j = 0; j < UNIVERSAL_SAMPLE_COUNT; j++) { - double f = N[j][i]; - double t = (double) j / (UNIVERSAL_SAMPLE_COUNT - 1); - if (f > max) { - max = f; - if (j == UNIVERSAL_SAMPLE_COUNT - 1) - bspline.params[i] = t; - } else if (f < max) { - bspline.params[i] = lastT; - break; - } - lastT = t; - } + for (int i = 0; i < bspline.n + 1; i++) { + double max = 0.0; //real.min(); + for (int j = 0; j < UNIVERSAL_SAMPLE_COUNT; j++) { + double f = N[j][i]; + double t = (double) j / (UNIVERSAL_SAMPLE_COUNT - 1); + if (f > max) { + max = f; + if (j == UNIVERSAL_SAMPLE_COUNT - 1) + bspline.params[i] = t; + } else if (f < max) { + bspline.params[i] = lastT; + break; + } + lastT = t; } + } } + void -printMatrix(Array2D<double>& m) { - printf("---\n"); - for (int i = 0; i < m.dim1(); i++) { - for (int j = 0; j < m.dim2(); j++) { - printf("% 5.5f ", m[i][j]); +printMatrix(Array2D<double>& m) +{ + printf("---\n"); + for (int i = 0; i < m.dim1(); i++) { + for (int j = 0; j < m.dim2(); j++) { + printf("% 5.5f ", m[i][j]); + } + printf("\n"); } - printf("\n"); - } } + ON_NurbsCurve* -interpolateLocalCubicCurve(ON_2dPointArray &Q) { - int num_samples = Q.Count(); - int num_segments = Q.Count() - 1; - int qsize = num_samples + 3; - ON_2dVector qarray[qsize]; - ON_2dVector *q = &qarray[1]; +interpolateLocalCubicCurve(ON_2dPointArray &Q) +{ + int num_samples = Q.Count(); + int num_segments = Q.Count() - 1; + int qsize = num_samples + 3; + ON_2dVector qarray[qsize]; + ON_2dVector *q = &qarray[1]; - for(int i=1; i < Q.Count(); i++) { - q[i] = Q[i] - Q[i-1]; - } - q[0] = 2.0*q[1] - q[2]; - q[-1] = 2.0*q[0] - q[1]; + for (int i=1; i < Q.Count(); i++) { + q[i] = Q[i] - Q[i-1]; + } + q[0] = 2.0*q[1] - q[2]; + q[-1] = 2.0*q[0] - q[1]; - q[num_samples] = 2*q[num_samples-1] - q[num_samples-2]; - q[num_samples+1] = 2*q[num_samples] - q[num_samples-1]; - q[num_samples+2] = 2*q[num_samples+1] - q[num_samples]; + q[num_samples] = 2*q[num_samples-1] - q[num_samples-2]; + q[num_samples+1] = 2*q[num_samples] - q[num_samples-1]; + q[num_samples+2] = 2*q[num_samples+1] - q[num_samples]; - ON_2dVector T[num_samples]; - double a[num_samples]; - for (int k=0; k < num_samples; k++ ) { - ON_3dVector a = ON_CrossProduct(q[k-1],q[k]); - ON_3dVector b = ON_CrossProduct(q[k+1],q[k+2]); - double alength = a.Length(); - if (NEAR_ZERO(alength,PBC_TOL)) { - a[k] = 1.0; - } else { - a[k] = (a.Length())/(a.Length() + b.Length()); - } - T[k] = (1.0 - a[k])*q[k] + a[k]*q[k+1]; - T[k].Unitize(); + ON_2dVector T[num_samples]; + double a[num_samples]; + for (int k=0; k < num_samples; k++) { + ON_3dVector a = ON_CrossProduct(q[k-1], q[k]); + ON_3dVector b = ON_CrossProduct(q[k+1], q[k+2]); + double alength = a.Length(); + if (NEAR_ZERO(alength, PBC_TOL)) { + a[k] = 1.0; + } else { + a[k] = (a.Length())/(a.Length() + b.Length()); } - ON_2dPointArray P[num_samples-1]; - ON_2dPointArray control_points; - control_points.Append(Q[0]); - for(int i=1; i<num_samples; i++) { - ON_2dPoint P0 = Q[i-1]; - ON_2dPoint P3 = Q[i]; - ON_2dVector T0 = T[i-1]; - ON_2dVector T3 = T[i]; + T[k] = (1.0 - a[k])*q[k] + a[k]*q[k+1]; + T[k].Unitize(); + } + ON_2dPointArray P[num_samples-1]; + ON_2dPointArray control_points; + control_points.Append(Q[0]); + for (int i=1; i<num_samples; i++) { + ON_2dPoint P0 = Q[i-1]; + ON_2dPoint P3 = Q[i]; + ON_2dVector T0 = T[i-1]; + ON_2dVector T3 = T[i]; - double a,b,c; + double a, b, c; - ON_2dVector vT0T3 = T0 + T3; - ON_2dVector dP0P3 = P3 - P0; - a = 16.0 - vT0T3.Length()*vT0T3.Length(); - b = 12.0*(dP0P3*vT0T3); - c = -36.0*dP0P3.Length()*dP0P3.Length(); + ON_2dVector vT0T3 = T0 + T3; + ON_2dVector dP0P3 = P3 - P0; + a = 16.0 - vT0T3.Length()*vT0T3.Length(); + b = 12.0*(dP0P3*vT0T3); + c = -36.0*dP0P3.Length()*dP0P3.Length(); - double alpha = (-b + sqrt(b*b - 4.0*a*c))/(2.0*a); + double alpha = (-b + sqrt(b*b - 4.0*a*c))/(2.0*a); - ON_2dPoint P1 = P0 + (1.0/3.0)*alpha*T0; - control_points.Append(P1); - ON_2dPoint P2 = P3 - (1.0/3.0)*alpha*T3; - control_points.Append(P2); - P[i-1].Append(P0); - P[i-1].Append(P1); - P[i-1].Append(P2); - P[i-1].Append(P3); - } - control_points.Append(Q[num_samples-1]); + ON_2dPoint P1 = P0 + (1.0/3.0)*alpha*T0; + control_points.Append(P1); + ON_2dPoint P2 = P3 - (1.0/3.0)*alpha*T3; + control_points.Append(P2); + P[i-1].Append(P0); + P[i-1].Append(P1); + P[i-1].Append(P2); + P[i-1].Append(P3); + } + control_points.Append(Q[num_samples-1]); - //generateParameters(spline); - double u[num_segments+1]; - u[0] = 0.0; - for(int k=0;k<num_segments;k++){ - u[k+1] = u[k] + 3.0*(P[k][1]-P[k][0]).Length(); - } - int degree = 3; + //generateParameters(spline); + double u[num_segments+1]; + u[0] = 0.0; + for (int k=0;k<num_segments;k++) { + u[k+1] = u[k] + 3.0*(P[k][1]-P[k][0]).Length(); + } + int degree = 3; int n = control_points.Count(); int p = degree; int m = n + p - 1; int dimension = 2; - ON_NurbsCurve* c = ON_NurbsCurve::New(dimension, - false, - degree+1, - n); - c->ReserveKnotCapacity(m); - for (int i = 0; i < degree; i++) { - c->SetKnot(i,0.0); - } - for (int i = 1; i < num_segments; i++) { - double knot_value = u[i]/u[num_segments]; - c->SetKnot(degree + 2*(i -1),knot_value); - c->SetKnot(degree + 2*(i -1) + 1,knot_value); - } - for (int i = m - p; i < m; i++) { - c->SetKnot(i,1.0); - } + ON_NurbsCurve* c = ON_NurbsCurve::New(dimension, + false, + degree+1, + n); + c->ReserveKnotCapacity(m); + for (int i = 0; i < degree; i++) { + c->SetKnot(i, 0.0); + } + for (int i = 1; i < num_segments; i++) { + double knot_value = u[i]/u[num_segments]; + c->SetKnot(degree + 2*(i -1), knot_value); + c->SetKnot(degree + 2*(i -1) + 1, knot_value); + } + for (int i = m - p; i < m; i++) { + c->SetKnot(i, 1.0); + } - // insert the control points - for (int i = 0; i < n; i++) { - ON_3dPoint p = control_points[i]; - c->SetCV(i,p); - } - return c; + // insert the control points + for (int i = 0; i < n; i++) { + ON_3dPoint p = control_points[i]; + c->SetCV(i, p); + } + return c; } + ON_NurbsCurve* interpolateLocalCubicCurve(ON_3dPointArray &Q) { @@ -559,7 +582,7 @@ ON_3dVector a = ON_CrossProduct(q[k - 1], q[k]); ON_3dVector b = ON_CrossProduct(q[k + 1], q[k + 2]); double alength = a.Length(); - if (NEAR_ZERO(alength,PBC_TOL)) { + if (NEAR_ZERO(alength, PBC_TOL)) { a[k] = 1.0; } else { a[k] = (a.Length()) / (a.Length() + b.Length()); @@ -630,398 +653,416 @@ return c; } + void generateControlPoints(BSpline& bspline, ON_2dPointArray &samples) { - Array2D<double> bigN(bspline.n+1, bspline.n+1); - //printMatrix(bigN); + Array2D<double> bigN(bspline.n+1, bspline.n+1); + //printMatrix(bigN); - for (int i = 0; i < bspline.n+1; i++) { - Array1D<double> n = Array1D<double>(bigN.dim2(), bigN[i]); - getCoefficients(bspline, n, bspline.params[i]); + for (int i = 0; i < bspline.n+1; i++) { + Array1D<double> n = Array1D<double>(bigN.dim2(), bigN[i]); + getCoefficients(bspline, n, bspline.params[i]); + //printMatrix(bigN); + } + Array2D<double> bigD(bspline.n+1, 2); + for (int i = 0; i < bspline.n+1; i++) { + bigD[i][0] = samples[i].x; + bigD[i][1] = samples[i].y; + } + + //printMatrix(bigD); //printMatrix(bigN); - } - Array2D<double> bigD(bspline.n+1,2); - for (int i = 0; i < bspline.n+1; i++) { - bigD[i][0] = samples[i].x; - bigD[i][1] = samples[i].y; - } - //printMatrix(bigD); - //printMatrix(bigN); + JAMA::LU<double> lu(bigN); + assert(lu.isNonsingular() > 0); + Array2D<double> bigP = lu.solve(bigD); // big linear algebra black box here... - JAMA::LU<double> lu(bigN); - assert(lu.isNonsingular() > 0); - Array2D<double> bigP = lu.solve(bigD); // big linear algebra black box here... - - // extract the control points - for (int i = 0; i < bspline.n+1; i++) { - ON_2dPoint& p = bspline.controls.AppendNew(); - p.x = bigP[i][0]; - p.y = bigP[i][1]; - } + // extract the control points + for (int i = 0; i < bspline.n+1; i++) { + ON_2dPoint& p = bspline.controls.AppendNew(); + p.x = bigP[i][0]; + p.y = bigP[i][1]; + } } + ON_NurbsCurve* -newNURBSCurve(BSpline& spline, int dimension=3) { - // we now have everything to complete our spline - ON_NurbsCurve* c = ON_NurbsCurve::New(dimension, - false, - spline.p+1, - spline.n+1); - c->ReserveKnotCapacity(spline.knots.size()-2); - for (int i = 1; i < spline.knots.size()-1; i++) { - c->m_knot[i-1] = spline.knots[i]; - } +newNURBSCurve(BSpline& spline, int dimension=3) +{ + // we now have everything to complete our spline + ON_NurbsCurve* c = ON_NurbsCurve::New(dimension, + false, + spline.p+1, + spline.n+1); + c->ReserveKnotCapacity(spline.knots.size()-2); + for (int i = 1; i < spline.knots.size()-1; i++) { + c->m_knot[i-1] = spline.knots[i]; + } - for (int i = 0; i < spline.controls.Count(); i++) { - c->SetCV(i, ON_3dPoint(spline.controls[i])); - } + for (int i = 0; i < spline.controls.Count(); i++) { + c->SetCV(i, ON_3dPoint(spline.controls[i])); + } - return c; + return c; } + ON_Curve* -interpolateCurve(ON_2dPointArray &samples) { - bool useBezier = false; - if (samples.Count() == 2) { - // build a line - return new ON_LineCurve(samples[0], samples[1]); - } else if (useBezier == true) { - ON_BezierCurve *bezier = new ON_BezierCurve( - samples); - ON_NurbsCurve nurbcurve; - if (bezier->GetNurbForm(nurbcurve)) { - return ON_NurbsCurve::New(*bezier); - } - // build a NURBS curve, then see if it can be simplified! - BSpline spline; - spline.p = 3; - spline.n = samples.Count() - 1; - spline.m = spline.n + spline.p + 1; - generateKnots(spline); - generateParameters(spline); - generateControlPoints(spline, samples); - ON_NurbsCurve* nurbs = newNURBSCurve(spline); +interpolateCurve(ON_2dPointArray &samples) +{ + bool useBezier = false; + if (samples.Count() == 2) { + // build a line + return new ON_LineCurve(samples[0], samples[1]); + } else if (useBezier == true) { + ON_BezierCurve *bezier = new ON_BezierCurve( + samples); + ON_NurbsCurve nurbcurve; + if (bezier->GetNurbForm(nurbcurve)) { + return ON_NurbsCurve::New(*bezier); + } + // build a NURBS curve, then see if it can be simplified! + BSpline spline; + spline.p = 3; + spline.n = samples.Count() - 1; + spline.m = spline.n + spline.p + 1; + generateKnots(spline); + generateParameters(spline); + generateControlPoints(spline, samples); + ON_NurbsCurve* nurbs = newNURBSCurve(spline); - // XXX - attempt to simplify here! + // XXX - attempt to simplify here! - return nurbs; + return nurbs; + } else { + ON_TextLog dump; + ON_NurbsCurve* nurbs; + if (false) { //(samples.Count() < 1000) { // + BSpline spline; + spline.p = 3; + spline.n = samples.Count()-1; + spline.m = spline.n + spline.p + 1; + generateKnots(spline); + generateParameters(spline); + generateControlPoints(spline, samples); + nurbs = newNURBSCurve(spline, 2); + //nurbs->Dump(dump); } else { - ON_TextLog dump; - ON_NurbsCurve* nurbs; - if (false) { //(samples.Count() < 1000) { // - BSpline spline; - spline.p = 3; - spline.n = samples.Count()-1; - spline.m = spline.n + spline.p + 1; - generateKnots(spline); - generateParameters(spline); - generateControlPoints(spline, samples); - nurbs = newNURBSCurve(spline,2); - //nurbs->Dump(dump); - } else { - // local vs. global interpolation for large point sampled curves - nurbs = interpolateLocalCubicCurve(samples); - //nurbs->Dump(dump); - } - return nurbs; + // local vs. global interpolation for large point sampled curves + nurbs = interpolateLocalCubicCurve(samples); + //nurbs->Dump(dump); + } + return nurbs; } } + /* * rc = 0 Not on seam, 1 on East/West seam(umin/umax), 2 on North/South seam(vmin/vmax), 3 seam on both U/V boundaries */ int -IsAtSeam(const ON_Surface *surf, double u, double v) { - int rc = 0; - int i; - for (i=0; i<2; i++){ - if (!surf->IsClosed(i)) - continue; - double p = (i) ? v : u; - if (NEAR_EQUAL(p,surf->Domain(i)[0],PBC_SEAM_TOL) || NEAR_EQUAL(p,surf->Domain(i)[1],PBC_SEAM_TOL)) - rc += (i+1); - } +IsAtSeam(const ON_Surface *surf, double u, double v) +{ + int rc = 0; + int i; + for (i=0; i<2; i++) { + if (!surf->IsClosed(i)) + continue; + double p = (i) ? v : u; + if (NEAR_EQUAL(p, surf->Domain(i)[0], PBC_SEAM_TOL) || NEAR_EQUAL(p, surf->Domain(i)[1], PBC_SEAM_TOL)) + rc += (i+1); + } - return rc; + return rc; } + int -IsAtSingularity(const ON_Surface *surf, double u, double v) { - // 0 = south, 1 = east, 2 = north, 3 = west - //cerr << "IsAtSingularity = u,v - " << u << "," << v << endl; - //cerr << "surf->Domain(0) - " << surf->Domain(0)[0] << "," << surf->Domain(0)[1] << endl; - //cerr << "surf->Domain(1) - " << surf->Domain(1)[0] << "," << surf->Domain(1)[1] << endl; - if (NEAR_EQUAL(u,surf->Domain(0)[0],PBC_TOL)) { - if (surf->IsSingular(3)) - return 3; - } else if (NEAR_EQUAL(u,surf->Domain(0)[1],PBC_TOL)) { - if (surf->IsSingular(1)) - return 1; - } - if (NEAR_EQUAL(v,surf->Domain(1)[0],PBC_TOL)) { - if (surf->IsSingular(0)) - return 0; - } else if (NEAR_EQUAL(v,surf->Domain(1)[1],PBC_TOL)) { - if (surf->IsSingular(2)) - return 2; - } - return -1; +IsAtSingularity(const ON_Surface *surf, double u, double v) +{ + // 0 = south, 1 = east, 2 = north, 3 = west + //std::cerr << "IsAtSingularity = u, v - " << u << ", " << v << std::endl; + //std::cerr << "surf->Domain(0) - " << surf->Domain(0)[0] << ", " << surf->Domain(0)[1] << std::endl; + //std::cerr << "surf->Domain(1) - " << surf->Domain(1)[0] << ", " << surf->Domain(1)[1] << std::endl; + if (NEAR_EQUAL(u, surf->Domain(0)[0], PBC_TOL)) { + if (surf->IsSingular(3)) + return 3; + } else if (NEAR_EQUAL(u, surf->Domain(0)[1], PBC_TOL)) { + if (surf->IsSingular(1)) + return 1; + } + if (NEAR_EQUAL(v, surf->Domain(1)[0], PBC_TOL)) { + if (surf->IsSingular(0)) + return 0; + } else if (NEAR_EQUAL(v, surf->Domain(1)[1], PBC_TOL)) { + if (surf->IsSingular(2)) + return 2; + } + return -1; } + ON_Curve* -test1_pullback_curve(const SurfaceTree* surfacetree, - const ON_Curve* curve, - double tolerance, - double flatness) { - ON_NurbsCurve* orig = curve->NurbsCurve(); - bool isRational = false; - // we now have everything to complete our spline - ON_NurbsCurve* c = ON_NurbsCurve::New(curve->Dimension(), - isRational, - orig->Degree()+1, - orig->m_cv_count+1); +test1_pullback_curve(const brlcad::SurfaceTree* surfacetree, + const ON_Curve* curve, + double tolerance, + double flatness) +{ + ON_NurbsCurve* orig = curve->NurbsCurve(); + bool isRational = false; + // we now have everything to complete our spline + ON_NurbsCurve* c = ON_NurbsCurve::New(curve->Dimension(), + isRational, + orig->Degree()+1, + orig->m_cv_count+1); - int numKnots = orig->Degree() + orig->m_cv_count -1; - c->ReserveKnotCapacity(numKnots); - double *span = new double[numKnots]; - if ( orig->GetSpanVector(span) ) { - for (int i = 0; i < numKnots; i++) { - c->SetKnot(i,span[i]); - } - } + int numKnots = orig->Degree() + orig->m_cv_count -1; + c->ReserveKnotCapacity(numKnots); + double *span = new double[numKnots]; + if (orig->GetSpanVector(span)) { + for (int i = 0; i < numKnots; i++) { + c->SetKnot(i, span[i]); + } + } - ON_2dPoint uv; - for (int i = 0; i < orig->m_cv_count; i++) { - ON_3dPoint p; - if ( orig->GetCV(i,p) ) { - if ( surfacetree->getSurfacePoint((const ON_3dPoint&)p,uv,(const ON_3dPoint&)p) > 0 ) { - c->SetCV(i, p); - } - } - } + ON_2dPoint uv; + for (int i = 0; i < orig->m_cv_count; i++) { + ON_3dPoint p; + if (orig->GetCV(i, p)) { + if (surfacetree->getSurfacePoint((const ON_3dPoint&)p, uv, (const ON_3dPoint&)p) > 0) { + c->SetCV(i, p); + } + } + } - return c; + return c; } + ON_Curve* -test2_pullback_curve(const SurfaceTree* surfacetree, - const ON_Curve* curve, - double tolerance, - double flatness) { - PBCData data; - data.tolerance = tolerance; - data.flatness = flatness; - data.curve = curve; - data.surftree = (SurfaceTree*)surfacetree; - ON_2dPointArray *samples= new ON_2dPointArray(); +test2_pullback_curve(const brlcad::SurfaceTree* surfacetree, + const ON_Curve* curve, + double tolerance, + double flatness) +{ + PBCData data; + data.tolerance = tolerance; + data.flatness = flatness; + data.curve = curve; + data.surftree = (brlcad::SurfaceTree*)surfacetree; + ON_2dPointArray *samples= new ON_2dPointArray(); - data.segments.push_back(samples); + data.segments.push_back(samples); - // Step 1 - adaptively sample the curve - double tmin, tmax; - data.curve->GetDomain(&tmin, &tmax); - int numKnots = curve->SpanCount(); - double *knots = new double[numKnots+1]; - curve->GetSpanVector(knots); + // Step 1 - adaptively sample the curve + double tmin, tmax; + data.curve->GetDomain(&tmin, &tmax); + int numKnots = curve->SpanCount(); + double *knots = new double[numKnots+1]; + curve->GetSpanVector(knots); - int samplesperknotinterval; - int degree = curve->Degree(); + int samplesperknotinterval; + int degree = curve->Degree(); - if (degree > 1) { - samplesperknotinterval = 3*degree; - } else { - samplesperknotinterval = 18*degree; - } - ON_2dPoint pt; - for (int i=0; i<=numKnots; i++) { - if (i <= numKnots/2) { - if (i>0) { - double delta = (knots[i] - knots[i-1])/(double)samplesperknotinterval; - for (int j=1; j<samplesperknotinterval; j++){ - if ( toUV(data, pt, knots[i-1]+j*delta, PBC_TOL) ) { - samples->Append(pt); - } else { - //cout << "didn't find point on surface" << endl; - } - } - } - if (toUV(data, pt, knots[i], PBC_TOL)) { - samples->Append(pt); - } else { - //cout << "didn't find point on surface" << endl; - } - } else { - if (i>0) { - double delta = (knots[i] - knots[i-1])/(double)samplesperknotinterval; - for (int j=1; j<samplesperknotinterval; j++){ - if ( toUV(data, pt, knots[i-1]+j*delta, -PBC_TOL)) { - samples->Append(pt); - } else { - //cout << "didn't find point on surface" << endl; - } - } - if ( toUV(data, pt, knots[i],-PBC_TOL) ) { - samples->Append(pt); - } else { - //cout << "didn't find point on surface" << endl; - } - } - } - } - delete [] knots; + if (degree > 1) { + samplesperknotinterval = 3*degree; + } else { + samplesperknotinterval = 18*degree; + } + ON_2dPoint pt; + for (int i=0; i<=numKnots; i++) { + if (i <= numKnots/2) { + if (i>0) { + double delta = (knots[i] - knots[i-1])/(double)samplesperknotinterval; + for (int j=1; j<samplesperknotinterval; j++) { + if (toUV(data, pt, knots[i-1]+j*delta, PBC_TOL)) { + samples->Append(pt); + } else { + //std::cout << "didn't find point on surface" << std::endl; + } + } + } + if (toUV(data, pt, knots[i], PBC_TOL)) { + samples->Append(pt); + } else { + //std::cout << "didn't find point on surface" << std::endl; + } + } else { + if (i>0) { + double delta = (knots[i] - knots[i-1])/(double)samplesperknotinterval; + for (int j=1; j<samplesperknotinterval; j++) { + if (toUV(data, pt, knots[i-1]+j*delta, -PBC_TOL)) { + samples->Append(pt); + } else { + //std::cout << "didn't find point on surface" << std::endl; + } + } + if (toUV(data, pt, knots[i], -PBC_TOL)) { + samples->Append(pt); + } else { + //std::cout << "didn't find point on surface" << std::endl; + } + } + } + } + delete [] knots; - cerr << endl << "samples:" << endl; - for (int i = 0; i < samples->Count(); i++) { - cerr << i << "- " << (*samples)[i].x << "," << (*samples)[i].y << endl; - } + std::cerr << std::endl << "samples:" << std::endl; + for (int i = 0; i < samples->Count(); i++) { + std::cerr << i << "- " << (*samples)[i].x << ", " << (*samples)[i].y << std::endl; + } - /* - ON_Surface *surf = (ON_Surface *)data.surftree->getSurface(); - ON_3dPoint p; - for (int i = 0; i < data.samples.Count(); i++) { - p=surf->PointAt(data.samples[i].x,data.samples[i].y); - cerr << data.samples[i].x << "," << data.samples[i].y; - cerr << " --> "<< p.x << "," << p.y << "," << p.z << endl; - } -*/ - return interpolateCurve(*samples); + /* + ON_Surface *surf = (ON_Surface *)data.surftree->getSurface(); + ON_3dPoint p; + for (int i = 0; i < data.samples.Count(); i++) { + p=surf->PointAt(data.samples[i].x, data.samples[i].y); + std::cerr << data.samples[i].x << ", " << data.samples[i].y; + std::cerr << " --> "<< p.x << ", " << p.y << ", " << p.z << std::endl; + } + */ + return interpolateCurve(*samples); } + + ON_2dPointArray * pullback_samples(PBCData* data, - double t, - double s) { - const ON_Curve* curve= data->curve; - ON_2dPointArray *samples= new ON_2dPointArray(); - int numKnots = curve->SpanCount(); - double *knots = new double[numKnots+1]; - curve->GetSpanVector(knots); + double t, + double s) +{ + const ON_Curve* curve= data->curve; + ON_2dPointArray *samples= new ON_2dPointArray(); + int numKnots = curve->SpanCount(); + double *knots = new double[numKnots+1]; + curve->GetSpanVector(knots); - int istart = 0; - while (t >= knots[istart]) - istart++; + int istart = 0; + while (t >= knots[istart]) + istart++; - if (istart > 0) { - istart--; - knots[istart] = t; - } + if (istart > 0) { + istart--; + knots[istart] = t; + } - int istop = numKnots; - while (s <= knots[istop]) - istop--; + int istop = numKnots; + while (s <= knots[istop]) + istop--; - if (istop < numKnots) { - istop++; - knots[istop] = s; - } + if (istop < numKnots) { + istop++; + knots[istop] = s; + } - //TODO: remove debugging code - //cerr << "t - " << t << " istart - " << istart << "knots[istart] - " << knots[istart] << endl; - //cerr << "s - " << s << " istop - " << istop << "knots[istop] - " << knots[istop] << endl; + //TODO: remove debugging code + //std::cerr << "t - " << t << " istart - " << istart << "knots[istart] - " << knots[istart] << std::endl; + //std::cerr << "s - " << s << " istop - " << istop << "knots[istop] - " << knots[istop] << std::endl; - int samplesperknotinterval; - int degree = curve->Degree(); + int samplesperknotinterval; + int degree = curve->Degree(); - if (degree > 1) { - samplesperknotinterval = 3*degree; + if (degree > 1) { + samplesperknotinterval = 3*degree; + } else { + samplesperknotinterval = 18*degree; + } + ON_2dPoint pt; + for (int i=istart; i<=istop; i++) { + if (i <= numKnots/2) { + if (i>0) { + double delta = (knots[i] - knots[i-1])/(double)samplesperknotinterval; + for (int j=1; j<samplesperknotinterval; j++) { + if (toUV(*data, pt, knots[i-1]+j*delta, PBC_FROM_OFFSET)) { + samples->Append(pt); + } else { + //cout << "didn't find point on surface" << std::endl; + } + } + } + if (toUV(*data, pt, knots[i], PBC_FROM_OFFSET)) { + samples->Append(pt); + } else { + //cout << "didn't find point on surface" << std::endl; + } } else { - samplesperknotinterval = 18*degree; - } - ON_2dPoint pt; - for (int i=istart; i<=istop; i++) { - if (i <= numKnots/2) { - if (i>0) { - double delta = (knots[i] - knots[i-1])/(double)samplesperknotinterval; - for (int j=1; j<samplesperknotinterval; j++){ - if ( toUV(*data, pt, knots[i-1]+j*delta, PBC_FROM_OFFSET) ) { - samples->Append(pt); - } else { - //cout << "didn't find point on surface" << endl; - } - } - } - if (toUV(*data, pt, knots[i], PBC_FROM_OFFSET)) { - samples->Append(pt); - } else { - //cout << "didn't find point on surface" << endl; - } + if (i>0) { + double delta = (knots[i] - knots[i-1])/(double)samplesperknotinterval; + for (int j=1; j<samplesperknotinterval; j++) { + if (toUV(*data, pt, knots[i-1]+j*delta, -PBC_FROM_OFFSET)) { + samples->Append(pt); + } else { + //cout << "didn't find point on surface" << std::endl; + } + } + if (toUV(*data, pt, knots[i], -PBC_FROM_OFFSET)) { + samples->Append(pt); } else { - if (i>0) { - double delta = (knots[i] - knots[i-1])/(double)samplesperknotinterval; - for (int j=1; j<samplesperknotinterval; j++){ - if ( toUV(*data, pt, knots[i-1]+j*delta, -PBC_FROM_OFFSET)) { - samples->Append(pt); - } else { - //cout << "didn't find point on surface" << endl; - } - } - if ( toUV(*data, pt, knots[i],-PBC_FROM_OFFSET) ) { - samples->Append(pt); - } else { - //cout << "didn't find point on surface" << endl; - } - } + //cout << "didn't find point on surface" << std::endl; } + } } - delete [] knots; - return samples; + } + delete [] knots; + return samples; } + PBCData * -pullback_samples(const SurfaceTree* surfacetree, - const ON_Curve* curve, - double tolerance, - double flatness) { - PBCData *data = new PBCData; - data->tolerance = tolerance; - data->flatness = flatness; - data->curve = curve; - data->surftree = (SurfaceTree*)surfacetree; - const ON_Surface *surf = data->surftree->getSurface(); +pullback_samples(const brlcad::SurfaceTree* surfacetree, + const ON_Curve* curve, + double tolerance, + double flatness) +{ + PBCData *data = new PBCData; + data->tolerance = tolerance; + data->flatness = flatness; + data->curve = curve; + data->surftree = (brlcad::SurfaceTree*)surfacetree; + const ON_Surface *surf = data->surftree->getSurface(); - double tmin, tmax; - data->curve->GetDomain(&tmin, &tmax); + double tmin, tmax; + data->curve->GetDomain(&tmin, &tmax); - if(surf->IsClosed(0) || surf->IsClosed(1) ) { - if ((tmin < 0.0) && (tmax > 0.0)) { - ON_2dPoint uv; - if ( toUV(*data, uv, 0.0, PBC_TOL) ) { - if (IsAtSeam(surf,uv.x,uv.y) > 0) { - ON_2dPointArray *samples1 = pullback_samples(data,tmin,0.0); - ON_2dPointArray *samples2 = pullback_samples(data,0.0,tmax); - if (samples1 != NULL) { - data->segments.push_back(samples1); - } - if (samples2 != NULL) { - data->segments.push_back(samples2); - } - //TODO: remove debugging code - if (false) - cerr << "need to divide curve across the seam" << endl; - } else { - ON_2dPointArray *samples = pullback_samples(data,tmin,tmax); - if (samples != NULL) { - data->segments.push_back(samples); - } - } - } else { - cerr << "pullback_samples:Error: cannot evaluate curve at parameter 0.0" << endl; - return NULL; - } - } else { - ON_2dPointArray *samples = pullback_samples(data,tmin,tmax); - if (samples != NULL) { - data->segments.push_back(samples); - } - } - } else { - ON_2dPointArray *samples = pullback_samples(data,tmin,tmax); - if (samples != NULL) { - data->segments.push_back(samples); - } - } - return data; + if (surf->IsClosed(0) || surf->IsClosed(1)) { + if ((tmin < 0.0) && (tmax > 0.0)) { + ON_2dPoint uv; + if (toUV(*data, uv, 0.0, PBC_TOL)) { + if (IsAtSeam(surf, uv.x, uv.y) > 0) { + ON_2dPointArray *samples1 = pullback_samples(data, tmin, 0.0); + ON_2dPointArray *samples2 = pullback_samples(data, 0.0, tmax); + if (samples1 != NULL) { + data->segments.push_back(samples1); + } + if (samples2 != NULL) { + data->segments.push_back(samples2); + } + //TODO: remove debugging code + if (false) + std::cerr << "need to divide curve across the seam" << std::endl; + } else { + ON_2dPointArray *samples = pullback_samples(data, tmin, tmax); + if (samples != NULL) { + data->segments.push_back(samples); + } + } + } else { + std::cerr << "pullback_samples:Error: cannot evaluate curve at parameter 0.0" << std::endl; + return NULL; + } + } else { + ON_2dPointArray *samples = pullback_samples(data, tmin, tmax); + if (samples != NULL) { + data->segments.push_back(samples); + } + } + } else { + ON_2dPointArray *samples = pullback_samples(data, tmin, tmax); + if (samples != NULL) { + data->segments.push_back(samples); + } + } + return data; } @@ -1040,14 +1081,14 @@ const ON_Surface *surface1 = face1->SurfaceOf(); const ON_Surface *surface2 = face2->SurfaceOf(); bool removeTrimmed = false; - SurfaceTree *st1 = new SurfaceTree(face1,removeTrimmed); - SurfaceTree *st2 = new SurfaceTree(face2,removeTrimmed); + brlcad::SurfaceTree *st1 = new brlcad::SurfaceTree(face1, removeTrimmed); + brlcad::SurfaceTree *st2 = new brlcad::SurfaceTree(face2, removeTrimmed); ON_Curve *curve = brep->m_C3[edge->m_c3i]; - double t0,t1; - curve->GetDomain(&t0,&t1); + double t0, t1; + curve->GetDomain(&t0, &t1); ON_Plane plane; - curve->FrameAt(t0,plane); + curve->FrameAt(t0, plane); ON_3dPoint origin = plane.Origin(); ON_3dVector xaxis = plane.Xaxis(); ON_3dVector yaxis = plane.Yaxis(); @@ -1064,9 +1105,9 @@ int degree = curve->Degree(); if (degree > 1) { - samplesperknotinterval = 3*degree; + samplesperknotinterval = 3*degree; } else { - samplesperknotinterval = 18*degree; + samplesperknotinterval = 18*degree; } ON_2dPoint pt; double t = 0.0; @@ -1096,7 +1137,7 @@ } } dist = ps1.DistanceTo(ps2); - if (NEAR_ZERO(dist,PBC_TOL)) { + if (NEAR_ZERO(dist, PBC_TOL)) { point = ps1; found = true; } else { @@ -1104,7 +1145,7 @@ ON_3dVector v2 = ps2 - point; knudgepoint = point; ON_3dVector deltav = v1 + v2; - if ( NEAR_ZERO(deltav.Length(),PBC_TOL) ) { + if (NEAR_ZERO(deltav.Length(), PBC_TOL)) { found = true; // as close as we are going to get } else { point = point + v1 + v2; @@ -1132,7 +1173,7 @@ } } dist = ps1.DistanceTo(ps2); - if (NEAR_ZERO(dist,PBC_TOL)) { + if (NEAR_ZERO(dist, PBC_TOL)) { point = ps1; found = true; } else { @@ -1140,7 +1181,7 @@ ON_3dVector v2 = ps2 - point; knudgepoint = point; ON_3dVector deltav = v1 + v2; - if ( NEAR_ZERO(deltav.Length(),PBC_TOL) ) { + if (NEAR_ZERO(deltav.Length(), PBC_TOL)) { found = true; // as close as we are going to get } else { point = point + v1 + v2; @@ -1171,7 +1212,7 @@ } } dist = ps1.DistanceTo(ps2); - if (NEAR_ZERO(dist,PBC_TOL)) { + if (NEAR_ZERO(dist, PBC_TOL)) { point = ps1; found = true; } else { @@ -1179,7 +1220,7 @@ ON_3dVector v2 = ps2 - point; knudgepoint = point; ON_3dVector deltav = v1 + v2; - if ( NEAR_ZERO(deltav.Length(),PBC_TOL) ) { + if (NEAR_ZERO(deltav.Length(), PBC_TOL)) { found = true; // as close as we are going to get } else { point = point + v1 + v2; @@ -1206,7 +1247,7 @@ } } dist = ps1.DistanceTo(ps2); - if (NEAR_ZERO(dist,PBC_TOL)) { + if (NEAR_ZERO(dist, PBC_TOL)) { point = ps1; found = true; } else { @@ -1214,7 +1255,7 @@ ON_3dVector v2 = ps2 - point; knudgepoint = point; ON_3dVector deltav = v1 + v2; - if ( NEAR_ZERO(deltav.Length(),PBC_TOL) ) { + if (NEAR_ZERO(deltav.Length(), PBC_TOL)) { found = true; // as close as we are going to get } else { point = point + v1 + v2; @@ -1230,910 +1271,944 @@ return NULL; } + bool -has_singularity(const ON_Surface *surf) { - bool ret = false; - // 0 = south, 1 = east, 2 = north, 3 = west - for(int i=0;i<4;i++){ - if (surf->IsSingular(i)) { +has_singularity(const ON_Surface *surf) +{ + bool ret = false; + // 0 = south, 1 = east, 2 = north, 3 = west + for (int i=0;i<4;i++) { + if (surf->IsSingular(i)) { /* - switch (i) { - case 0: - cout << "Singular South" << endl; - break; - case 1: - cout << "Singular East" << endl; - break; - case 2: - cout << "Singular North" << endl; - break; - case 3: - cout << "Singular West" << endl; - } + switch (i) { + case 0: + std::cout << "Singular South" << std::endl; + break; + case 1: + std::cout << "Singular East" << std::endl; + break; + case 2: + std::cout << "Singular North" << std::endl; + break; + case 3: + std::cout << "Singular West" << std::endl; + } */ - ret= true; - } + ret= true; } - return ret; + } + return ret; } -bool is_closed(const ON_Surface *surf) { - bool ret = false; - // dir 0 = "s", 1 = "t" - for(int i=0;i<2;i++){ - if (surf->IsClosed(i)) { + + +bool is_closed(const ON_Surface *surf) +{ + bool ret = false; + // dir 0 = "s", 1 = "t" + for (int i=0;i<2;i++) { + if (surf->IsClosed(i)) { // switch (i) { // case 0: -// cout << "Closed in U" << endl; +// std::cout << "Closed in U" << std::endl; // break; // case 1: -// cout << "Closed in V" << endl; +// std::cout << "Closed in V" << std::endl; // } - ret = true; - } + ret = true; } - return ret; + } + return ret; } + + bool -check_pullback_closed( list<PBCData*> &pbcs) { - list<PBCData*>::iterator d = pbcs.begin(); - const ON_Surface *surf = (*d)->surftree->getSurface(); - //TODO: - // 0 = U, 1 = V - if (surf->IsClosed(0) && surf->IsClosed(1)) { - //TODO: need to check how torus UV looks to determine checks - cerr << "Is this some kind of torus????" << endl; - } else if (surf->IsClosed(0)) { - //check_pullback_closed_U(pbcs); - cout << "check closed in U" << endl; - } else if (surf->IsClosed(1)) { - //check_pullback_closed_V(pbcs); - cout << "check closed in V" << endl; - } - return true; +check_pullback_closed(list<PBCData*> &pbcs) +{ + list<PBCData*>::iterator d = pbcs.begin(); + const ON_Surface *surf = (*d)->surftree->getSurface(); + //TODO: + // 0 = U, 1 = V + if (surf->IsClosed(0) && surf->IsClosed(1)) { + //TODO: need to check how torus UV looks to determine checks + std::cerr << "Is this some kind of torus????" << std::endl; + } else if (surf->IsClosed(0)) { + //check_pullback_closed_U(pbcs); + std::cout << "check closed in U" << std::endl; + } else if (surf->IsClosed(1)) { + //check_pullback_closed_V(pbcs); + std::cout << "check closed in V" << std::endl; + } + return true; } + bool -check_pullback_singular_east( list<PBCData*> &pbcs) { - list<PBCData *>::iterator cs = pbcs.begin(); - const ON_Surface *surf = (*cs)->surftree->getSurface(); - double umin,umax; - ON_2dPoint *prev = NULL; - ON_2dPoint *noprev = NULL; +check_pullback_singular_east(list<PBCData*> &pbcs) +{ + list<PBCData *>::iterator cs = pbcs.begin(); + const ON_Surface *surf = (*cs)->surftree->getSurface(); + double umin, umax; + ON_2dPoint *prev = NULL; + ON_2dPoint *noprev = NULL; - surf->GetDomain(0,&umin,&umax); - cout << "Umax: " << umax << endl; - while(cs!=pbcs.end()) { - PBCData *data = (*cs); - list<ON_2dPointArray *>::iterator si = data->segments.begin(); - int segcnt = 0; - while (si != data->segments.end()) { - ON_2dPointArray *samples = (*si); - cerr << endl << "Segment:" << ++segcnt << endl; - if (true) { - int ilast = samples->Count() - 1; - cerr << endl << 0 << "- " << (*samples)[0].x << "," << (*samples)[0].y << endl; - cerr << ilast << "- " << (*samples)[ilast].x << "," << (*samples)[ilast].y << endl; + surf->GetDomain(0, &umin, &umax); + std::cout << "Umax: " << umax << std::endl; + while (cs!=pbcs.end()) { + PBCData *data = (*cs); + list<ON_2dPointArray *>::iterator si = data->segments.begin(); + int segcnt = 0; + while (si != data->segments.end()) { + ON_2dPointArray *samples = (*si); + std::cerr << std::endl << "Segment:" << ++segcnt << std::endl; + if (true) { + int ilast = samples->Count() - 1; + std::cerr << std::endl << 0 << "- " << (*samples)[0].x << ", " << (*samples)[0].y << std::endl; + std::cerr << ilast << "- " << (*samples)[ilast].x << ", " << (*samples)[ilast].y << std::endl; + } else { + for (int i = 0; i < samples->Count(); i++) { + if (NEAR_EQUAL((*samples)[i].x, umax, PBC_TOL)) { + if (prev != NULL) { + std::cerr << "prev - " << prev->x << ", " << prev->y << std::endl; } else { - for (int i = 0; i < samples->Count(); i++) { - if (NEAR_EQUAL((*samples)[i].x,umax,PBC_TOL)) { - if (prev != NULL) { - cerr << "prev - " << prev->x << "," << prev->y << endl; - } else { - noprev = &(*samples)[i]; - } - cerr << i << "- " << (*samples)[i].x << "," << (*samples)[i].y << endl << endl; - } - prev = &(*samples)[i]; - } + noprev = &(*samples)[i]; } - si ++; + std::cerr << i << "- " << (*samples)[i].x << ", " << (*samples)[i].y << std::endl << std::endl; + } + prev = &(*samples)[i]; } - cs++; + } + si ++; } - //cerr << "noprev - " << noprev->x << "," << noprev->y << endl; - //cerr << "last - " << prev->x << "," << prev->y << endl; - return true; + cs++; + } + //std::cerr << "noprev - " << noprev->x << ", " << noprev->y << std::endl; + //std::cerr << "last - " << prev->x << ", " << prev->y << std::endl; + return true; } + bool -check_pullback_singular( list<PBCData*> &pbcs) { - list<PBCData*>::iterator d = pbcs.begin(); - const ON_Surface *surf = (*d)->surftree->getSurface(); - int cnt = 0; +check_pullback_singular(list<PBCData*> &pbcs) +{ + list<PBCData*>::iterator d = pbcs.begin(); + const ON_Surface *surf = (*d)->surftree->getSurface(); + int cnt = 0; - for(int i=0;i<4;i++){ - if (surf->IsSingular(i)) { - cnt++; - } + for (int i=0;i<4;i++) { + if (surf->IsSingular(i)) { + cnt++; } - if (cnt > 2) { - //TODO: I don't think this makes sense but check out - cerr << "Is this some kind of sickness????" << endl; - return false; - } else if (cnt == 2) { - if (surf->IsSingular(0) && surf->IsSingular(2)) { - cout << "check singular North-South" << endl; - } else if (surf->IsSingular(1) && surf->IsSingular(2)) { - cout << "check singular East-West" << endl; - } else { - //TODO: I don't think this makes sense but check out - cerr << "Is this some kind of sickness????" << endl; - return false; - } + } + if (cnt > 2) { + //TODO: I don't think this makes sense but check out + std::cerr << "Is this some kind of sickness????" << std::endl; + return false; + } else if (cnt == 2) { + if (surf->IsSingular(0) && surf->IsSingular(2)) { + std::cout << "check singular North-South" << std::endl; + } else if (surf->IsSingular(1) && surf->IsSingular(2)) { + std::cout << "check singular East-West" << std::endl; } else { - if (surf->IsSingular(0)) { - cout << "check singular South" << endl; - } else if (surf->IsSingular(1)) { - cout << "check singular East" << endl; - if (check_pullback_singular_east(pbcs)) { - return true; - } - } else if (surf->IsSingular(2)) { - cout << "check singular North" << endl; - } else if (surf->IsSingular(3)) { - cout << "check singular West" << endl; - } + //TODO: I don't think this makes sense but check out + std::cerr << "Is this some kind of sickness????" << std::endl; + return false; } - return true; + } else { + if (surf->IsSingular(0)) { + std::cout << "check singular South" << std::endl; + } else if (surf->IsSingular(1)) { + std::cout << "check singular East" << std::endl; + if (check_pullback_singular_east(pbcs)) { + return true; + } + } else if (surf->IsSingular(2)) { + std::cout << "check singular North" << std::endl; + } else if (surf->IsSingular(3)) { + std::cout << "check singular West" << std::endl; + } + } + return true; } + void -print_pullback_data(string str, list<PBCData*> &pbcs, bool justendpoints) { - list<PBCData*>::iterator cs = pbcs.begin(); - int trimcnt=0; - if (justendpoints) { - // print out endpoints before - cerr << "EndPoints " << str << ":"<< endl; - while(cs!=pbcs.end()) { - PBCData *data = (*cs); - const ON_Surface *surf = data->surftree->getSurface(); - list<ON_2dPointArray *>::iterator si = data->segments.begin(); - int segcnt = 0; - while (si != data->segments.end()) { - ON_2dPointArray *samples = (*si); - cerr << endl << " Segment:" << ++segcnt << endl; - int ilast = samples->Count() - 1; - cerr << " T:" << ++trimcnt << endl; - int i=0; - int singularity=IsAtSingularity(surf,(*samples)[i].x,(*samples)[i].y); - int seam=IsAtSeam(surf,(*samples)[i].x,(*samples)[i].y); - cerr << "--------"; - if ((seam>0) && (singularity>=0)) { - cerr << " S/S " << (*samples)[i].x << "," << (*samples)[i].y; - } else if (seam>0) { - cerr << " Seam " << (*samples)[i].x << "," << (*samples)[i].y; - } else if (singularity>=0) { - cerr << " Sing " << (*samples)[i].x << "," << (*samples)[i].y; - } else { - cerr << " " << (*samples)[i].x << "," << (*samples)[i].y; - } - ON_3dPoint p = surf->PointAt((*samples)[i].x,(*samples)[i].y ); - cerr << " ( " << p.x << ", " << p.y << ", " << p.z << " ) "<< endl; +print_pullback_data(string str, list<PBCData*> &pbcs, bool justendpoints) +{ + list<PBCData*>::iterator cs = pbcs.begin(); + int trimcnt=0; + if (justendpoints) { + // print out endpoints before + std::cerr << "EndPoints " << str << ":"<< std::endl; + while (cs!=pbcs.end()) { + PBCData *data = (*cs); + const ON_Surface *surf = data->surftree->getSurface(); + list<ON_2dPointArray *>::iterator si = data->segments.begin(); + int segcnt = 0; + while (si != data->segments.end()) { + ON_2dPointArray *samples = (*si); + std::cerr << std::endl << " Segment:" << ++segcnt << std::endl; + int ilast = samples->Count() - 1; + std::cerr << " T:" << ++trimcnt << std::endl; + int i=0; + int singularity=IsAtSingularity(surf, (*samples)[i].x, (*samples)[i].y); + int seam=IsAtSeam(surf, (*samples)[i].x, (*samples)[i].y); + std::cerr << "--------"; + if ((seam>0) && (singularity>=0)) { + std::cerr << " S/S " << (*samples)[i].x << ", " << (*samples)[i].y; + } else if (seam>0) { + std::cerr << " Seam " << (*samples)[i].x << ", " << (*samples)[i].y; + } else if (singularity>=0) { + std::cerr << " Sing " << (*samples)[i].x << ", " << (*samples)[i].y; + } else { + std::cerr << " " << (*samples)[i].x << ", " << (*samples)[i].y; + } + ON_3dPoint p = surf->PointAt((*samples)[i].x, (*samples)[i].y); + std::cerr << " (" << p.x << ", " << p.y << ", " << p.z << ") "<< std::endl; - i=ilast; - singularity=IsAtSingularity(surf,(*samples)[i].x,(*samples)[i].y); - seam=IsAtSeam(surf,(*samples)[i].x,(*samples)[i].y); - cerr << " "; - if ((seam>0) && (singularity>=0)) { - cerr << " S/S " << (*samples)[i].x << "," << (*samples)[i].y << endl; - } else if (seam>0) { - cerr << " Seam " << (*samples)[i].x << "," << (*samples)... [truncated message content] |
From: <ind...@us...> - 2009-12-29 12:26:52
|
Revision: 37057 http://brlcad.svn.sourceforge.net/brlcad/?rev=37057&view=rev Author: indianlarry Date: 2009-12-29 12:26:28 +0000 (Tue, 29 Dec 2009) Log Message: ----------- Start of updates to cleanup compile warnings including cleaned up of some variable shadowing, namespace path additions to standard IO items, cleaned up of some CPP defs in the STEP generated code(will need to address in 'fedex') Modified Paths: -------------- brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h brlcad/trunk/src/conv/step/AdvancedFace.cpp brlcad/trunk/src/conv/step/AdvancedFace.h brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.cpp brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.h brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.cpp brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.h brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.cpp brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.h brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.cpp brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.h brlcad/trunk/src/conv/step/AreaContextDependentUnit.cpp brlcad/trunk/src/conv/step/AreaContextDependentUnit.h brlcad/trunk/src/conv/step/AreaConversionBasedUnit.cpp brlcad/trunk/src/conv/step/AreaConversionBasedUnit.h brlcad/trunk/src/conv/step/AreaSiUnit.cpp brlcad/trunk/src/conv/step/AreaSiUnit.h brlcad/trunk/src/conv/step/AreaUnit.cpp brlcad/trunk/src/conv/step/AreaUnit.h brlcad/trunk/src/conv/step/Axis1Placement.cpp brlcad/trunk/src/conv/step/Axis1Placement.h brlcad/trunk/src/conv/step/Axis2Placement.cpp brlcad/trunk/src/conv/step/Axis2Placement.h brlcad/trunk/src/conv/step/Axis2Placement2D.cpp brlcad/trunk/src/conv/step/Axis2Placement2D.h brlcad/trunk/src/conv/step/Axis2Placement3D.cpp brlcad/trunk/src/conv/step/Axis2Placement3D.h brlcad/trunk/src/conv/step/BSplineCurve.cpp brlcad/trunk/src/conv/step/BSplineCurve.h brlcad/trunk/src/conv/step/BSplineCurveWithKnots.cpp brlcad/trunk/src/conv/step/BSplineCurveWithKnots.h brlcad/trunk/src/conv/step/BSplineSurface.cpp brlcad/trunk/src/conv/step/BSplineSurface.h brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.cpp brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.h brlcad/trunk/src/conv/step/BezierCurve.cpp brlcad/trunk/src/conv/step/BezierCurve.h brlcad/trunk/src/conv/step/BezierSurface.cpp brlcad/trunk/src/conv/step/BezierSurface.h brlcad/trunk/src/conv/step/BoundaryCurve.cpp brlcad/trunk/src/conv/step/BoundaryCurve.h brlcad/trunk/src/conv/step/BoundedCurve.cpp brlcad/trunk/src/conv/step/BoundedCurve.h brlcad/trunk/src/conv/step/BoundedPCurve.cpp brlcad/trunk/src/conv/step/BoundedPCurve.h brlcad/trunk/src/conv/step/BoundedSurface.cpp brlcad/trunk/src/conv/step/BoundedSurface.h brlcad/trunk/src/conv/step/BoundedSurfaceCurve.cpp brlcad/trunk/src/conv/step/BoundedSurfaceCurve.h brlcad/trunk/src/conv/step/CartesianPoint.cpp brlcad/trunk/src/conv/step/CartesianPoint.h brlcad/trunk/src/conv/step/CartesianTransformationOperator.cpp brlcad/trunk/src/conv/step/CartesianTransformationOperator.h brlcad/trunk/src/conv/step/CartesianTransformationOperator2D.cpp brlcad/trunk/src/conv/step/CartesianTransformationOperator2D.h brlcad/trunk/src/conv/step/CartesianTransformationOperator3D.cpp brlcad/trunk/src/conv/step/CartesianTransformationOperator3D.h brlcad/trunk/src/conv/step/Circle.cpp brlcad/trunk/src/conv/step/Circle.h brlcad/trunk/src/conv/step/ClosedShell.cpp brlcad/trunk/src/conv/step/ClosedShell.h brlcad/trunk/src/conv/step/CompositeCurve.cpp brlcad/trunk/src/conv/step/CompositeCurve.h brlcad/trunk/src/conv/step/CompositeCurveOnSurface.cpp brlcad/trunk/src/conv/step/CompositeCurveOnSurface.h brlcad/trunk/src/conv/step/CompositeCurveSegment.cpp brlcad/trunk/src/conv/step/CompositeCurveSegment.h brlcad/trunk/src/conv/step/Conic.cpp brlcad/trunk/src/conv/step/Conic.h brlcad/trunk/src/conv/step/ConicalSurface.cpp brlcad/trunk/src/conv/step/ConicalSurface.h brlcad/trunk/src/conv/step/ConnectedFaceSet.cpp brlcad/trunk/src/conv/step/ConnectedFaceSet.h brlcad/trunk/src/conv/step/ContextDependentUnit.cpp brlcad/trunk/src/conv/step/ContextDependentUnit.h brlcad/trunk/src/conv/step/ConversionBasedUnit.cpp brlcad/trunk/src/conv/step/ConversionBasedUnit.h brlcad/trunk/src/conv/step/Curve.cpp brlcad/trunk/src/conv/step/Curve.h brlcad/trunk/src/conv/step/CurveBoundedSurface.cpp brlcad/trunk/src/conv/step/CurveBoundedSurface.h brlcad/trunk/src/conv/step/CurveReplica.cpp brlcad/trunk/src/conv/step/CurveReplica.h brlcad/trunk/src/conv/step/CylindricalSurface.cpp brlcad/trunk/src/conv/step/CylindricalSurface.h brlcad/trunk/src/conv/step/DefinitionalRepresentation.cpp brlcad/trunk/src/conv/step/DefinitionalRepresentation.h brlcad/trunk/src/conv/step/DerivedUnit.cpp brlcad/trunk/src/conv/step/DerivedUnit.h brlcad/trunk/src/conv/step/DerivedUnitElement.cpp brlcad/trunk/src/conv/step/DerivedUnitElement.h brlcad/trunk/src/conv/step/DimensionalExponents.cpp brlcad/trunk/src/conv/step/DimensionalExponents.h brlcad/trunk/src/conv/step/Direction.cpp brlcad/trunk/src/conv/step/Direction.h brlcad/trunk/src/conv/step/Edge.cpp brlcad/trunk/src/conv/step/Edge.h brlcad/trunk/src/conv/step/EdgeCurve.cpp brlcad/trunk/src/conv/step/EdgeCurve.h brlcad/trunk/src/conv/step/EdgeLoop.cpp brlcad/trunk/src/conv/step/EdgeLoop.h brlcad/trunk/src/conv/step/ElectricCurrentContextDependentUnit.cpp brlcad/trunk/src/conv/step/ElectricCurrentContextDependentUnit.h brlcad/trunk/src/conv/step/ElectricCurrentConversionBasedUnit.cpp brlcad/trunk/src/conv/step/ElectricCurrentConversionBasedUnit.h brlcad/trunk/src/conv/step/ElectricCurrentSiUnit.cpp brlcad/trunk/src/conv/step/ElectricCurrentSiUnit.h brlcad/trunk/src/conv/step/ElectricCurrentUnit.cpp brlcad/trunk/src/conv/step/ElectricCurrentUnit.h brlcad/trunk/src/conv/step/ElementarySurface.cpp brlcad/trunk/src/conv/step/ElementarySurface.h brlcad/trunk/src/conv/step/Ellipse.cpp brlcad/trunk/src/conv/step/Ellipse.h brlcad/trunk/src/conv/step/Face.cpp brlcad/trunk/src/conv/step/Face.h brlcad/trunk/src/conv/step/FaceBound.cpp brlcad/trunk/src/conv/step/FaceBound.h brlcad/trunk/src/conv/step/FaceOuterBound.cpp brlcad/trunk/src/conv/step/FaceOuterBound.h brlcad/trunk/src/conv/step/FaceSurface.cpp brlcad/trunk/src/conv/step/FaceSurface.h brlcad/trunk/src/conv/step/Factory.cpp brlcad/trunk/src/conv/step/Factory.h brlcad/trunk/src/conv/step/FoundedItem.cpp brlcad/trunk/src/conv/step/FoundedItem.h brlcad/trunk/src/conv/step/FunctionallyDefinedTransformation.cpp brlcad/trunk/src/conv/step/FunctionallyDefinedTransformation.h Modified: brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp =================================================================== --- brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -47,9 +47,9 @@ } -AdvancedBrepShapeRepresentation::AdvancedBrepShapeRepresentation(STEPWrapper *sw, int STEPid) { +AdvancedBrepShapeRepresentation::AdvancedBrepShapeRepresentation(STEPWrapper *sw, int step_id) { step = sw; - id = STEPid; + id = step_id; } Modified: brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h =================================================================== --- brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AdvancedBrepShapeRepresentation.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -49,7 +49,7 @@ public: AdvancedBrepShapeRepresentation(); - AdvancedBrepShapeRepresentation(STEPWrapper *sw, int STEPid); + AdvancedBrepShapeRepresentation(STEPWrapper *sw,int step_id); virtual ~AdvancedBrepShapeRepresentation(); ON_Brep *GetONBrep(); Modified: brlcad/trunk/src/conv/step/AdvancedFace.cpp =================================================================== --- brlcad/trunk/src/conv/step/AdvancedFace.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AdvancedFace.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -40,9 +40,9 @@ id = 0; } -AdvancedFace::AdvancedFace(STEPWrapper *sw, int STEPid) { +AdvancedFace::AdvancedFace(STEPWrapper *sw, int step_id) { step = sw; - id = STEPid; + id = step_id; } AdvancedFace::~AdvancedFace() { @@ -54,7 +54,7 @@ id = sse->STEPfile_id; if ( !FaceSurface::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::FaceSurface." << endl; + std::cout << CLASSNAME << ":Error loading base class ::FaceSurface." << std::endl; return false; } return true; @@ -62,10 +62,10 @@ void AdvancedFace::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; FaceSurface::Print(level+1); } @@ -78,7 +78,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -92,7 +92,7 @@ AdvancedFace::LoadONBrep(ON_Brep *brep) { if (!FaceSurface::LoadONBrep(brep)) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } return true; Modified: brlcad/trunk/src/conv/step/AdvancedFace.h =================================================================== --- brlcad/trunk/src/conv/step/AdvancedFace.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AdvancedFace.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -38,7 +38,7 @@ public: AdvancedFace(); virtual ~AdvancedFace(); - AdvancedFace(STEPWrapper *sw, int STEPid); + AdvancedFace(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw, SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -38,9 +38,9 @@ id = 0; } -AmountOfSubstanceContextDependentUnit::AmountOfSubstanceContextDependentUnit(STEPWrapper *sw,int STEPid) { +AmountOfSubstanceContextDependentUnit::AmountOfSubstanceContextDependentUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } AmountOfSubstanceContextDependentUnit::~AmountOfSubstanceContextDependentUnit() { @@ -54,11 +54,11 @@ // load base class attributes if ( !AmountOfSubstanceUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ContextDependentUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -67,10 +67,10 @@ void AmountOfSubstanceContextDependentUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; AmountOfSubstanceUnit::Print(level+1); ContextDependentUnit::Print(level+1); @@ -84,7 +84,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceContextDependentUnit.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -39,7 +39,7 @@ public: AmountOfSubstanceContextDependentUnit(); virtual ~AmountOfSubstanceContextDependentUnit(); - AmountOfSubstanceContextDependentUnit(STEPWrapper *sw,int STEPid); + AmountOfSubstanceContextDependentUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -41,9 +41,9 @@ id = 0; } -AmountOfSubstanceConversionBasedUnit::AmountOfSubstanceConversionBasedUnit(STEPWrapper *sw,int STEPid) { +AmountOfSubstanceConversionBasedUnit::AmountOfSubstanceConversionBasedUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } AmountOfSubstanceConversionBasedUnit::~AmountOfSubstanceConversionBasedUnit() { @@ -57,11 +57,11 @@ // load base class attributes if ( !AmountOfSubstanceUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ConversionBasedUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -70,10 +70,10 @@ void AmountOfSubstanceConversionBasedUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; AmountOfSubstanceUnit::Print(level+1); ConversionBasedUnit::Print(level+1); @@ -87,7 +87,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceConversionBasedUnit.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -39,7 +39,7 @@ public: AmountOfSubstanceConversionBasedUnit(); virtual ~AmountOfSubstanceConversionBasedUnit(); - AmountOfSubstanceConversionBasedUnit(STEPWrapper *sw,int STEPid); + AmountOfSubstanceConversionBasedUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -38,9 +38,9 @@ id = 0; } -AmountOfSubstanceSiUnit::AmountOfSubstanceSiUnit(STEPWrapper *sw,int STEPid) { +AmountOfSubstanceSiUnit::AmountOfSubstanceSiUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } AmountOfSubstanceSiUnit::~AmountOfSubstanceSiUnit() { @@ -54,11 +54,11 @@ // load base class attributes if ( !AmountOfSubstanceUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !SiUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -67,10 +67,10 @@ void AmountOfSubstanceSiUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; AmountOfSubstanceUnit::Print(level+1); SiUnit::Print(level+1); @@ -84,7 +84,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceSiUnit.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -39,7 +39,7 @@ public: AmountOfSubstanceSiUnit(); virtual ~AmountOfSubstanceSiUnit(); - AmountOfSubstanceSiUnit(STEPWrapper *sw,int STEPid); + AmountOfSubstanceSiUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -38,9 +38,9 @@ id = 0; } -AmountOfSubstanceUnit::AmountOfSubstanceUnit(STEPWrapper *sw,int STEPid) { +AmountOfSubstanceUnit::AmountOfSubstanceUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } AmountOfSubstanceUnit::~AmountOfSubstanceUnit() { @@ -54,7 +54,7 @@ // load base class attributes if ( !NamedUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -63,10 +63,10 @@ void AmountOfSubstanceUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; NamedUnit::Print(level+1); } @@ -79,7 +79,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AmountOfSubstanceUnit.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -38,7 +38,7 @@ public: AmountOfSubstanceUnit(); virtual ~AmountOfSubstanceUnit(); - AmountOfSubstanceUnit(STEPWrapper *sw,int STEPid); + AmountOfSubstanceUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/AreaContextDependentUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AreaContextDependentUnit.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AreaContextDependentUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -38,9 +38,9 @@ id = 0; } -AreaContextDependentUnit::AreaContextDependentUnit(STEPWrapper *sw,int STEPid) { +AreaContextDependentUnit::AreaContextDependentUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } AreaContextDependentUnit::~AreaContextDependentUnit() { @@ -54,11 +54,11 @@ // load base class attributes if ( !AreaUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ContextDependentUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -67,10 +67,10 @@ void AreaContextDependentUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; AreaUnit::Print(level+1); ContextDependentUnit::Print(level+1); @@ -84,7 +84,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/AreaContextDependentUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AreaContextDependentUnit.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AreaContextDependentUnit.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -39,7 +39,7 @@ public: AreaContextDependentUnit(); virtual ~AreaContextDependentUnit(); - AreaContextDependentUnit(STEPWrapper *sw,int STEPid); + AreaContextDependentUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/AreaConversionBasedUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AreaConversionBasedUnit.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AreaConversionBasedUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -41,9 +41,9 @@ id = 0; } -AreaConversionBasedUnit::AreaConversionBasedUnit(STEPWrapper *sw,int STEPid) { +AreaConversionBasedUnit::AreaConversionBasedUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } AreaConversionBasedUnit::~AreaConversionBasedUnit() { @@ -57,11 +57,11 @@ // load base class attributes if ( !AreaUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ConversionBasedUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -70,10 +70,10 @@ void AreaConversionBasedUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; AreaUnit::Print(level+1); ConversionBasedUnit::Print(level+1); @@ -87,7 +87,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/AreaConversionBasedUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AreaConversionBasedUnit.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AreaConversionBasedUnit.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -39,7 +39,7 @@ public: AreaConversionBasedUnit(); virtual ~AreaConversionBasedUnit(); - AreaConversionBasedUnit(STEPWrapper *sw,int STEPid); + AreaConversionBasedUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/AreaSiUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AreaSiUnit.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AreaSiUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -38,9 +38,9 @@ id = 0; } -AreaSiUnit::AreaSiUnit(STEPWrapper *sw,int STEPid) { +AreaSiUnit::AreaSiUnit(STEPWrapper *sw,int step_id){ step = sw; - id = STEPid; + id = step_id; } AreaSiUnit::~AreaSiUnit() { @@ -53,11 +53,11 @@ // load base class attributes if ( !AreaUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !SiUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -66,10 +66,10 @@ void AreaSiUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; AreaUnit::Print(level+1); SiUnit::Print(level+1); @@ -83,7 +83,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/AreaSiUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AreaSiUnit.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AreaSiUnit.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -39,7 +39,7 @@ public: AreaSiUnit(); virtual ~AreaSiUnit(); - AreaSiUnit(STEPWrapper *sw,int STEPid); + AreaSiUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/AreaUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/AreaUnit.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AreaUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -38,9 +38,9 @@ id = 0; } -AreaUnit::AreaUnit(STEPWrapper *sw,int STEPid) { +AreaUnit::AreaUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } AreaUnit::~AreaUnit() { @@ -54,7 +54,7 @@ // load base class attributes if ( !NamedUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -63,10 +63,10 @@ void AreaUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; NamedUnit::Print(level+1); } @@ -79,7 +79,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/AreaUnit.h =================================================================== --- brlcad/trunk/src/conv/step/AreaUnit.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/AreaUnit.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -38,7 +38,7 @@ public: AreaUnit(); virtual ~AreaUnit(); - AreaUnit(STEPWrapper *sw,int STEPid); + AreaUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/Axis1Placement.cpp =================================================================== --- brlcad/trunk/src/conv/step/Axis1Placement.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/Axis1Placement.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -42,9 +42,9 @@ axis = NULL; } -Axis1Placement::Axis1Placement(STEPWrapper *sw,int STEPid) { +Axis1Placement::Axis1Placement(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; axis = NULL; } @@ -94,7 +94,7 @@ id = sse->STEPfile_id; if ( !Placement::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Placement." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Placement." << std::endl; return false; } @@ -118,14 +118,14 @@ void Axis1Placement::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << endl; + TAB(level); std::cout << CLASSNAME << ":" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "ref_direction:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "ref_direction:" << std::endl; if (axis) axis->Print(level+1); - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; Placement::Print(level+1); } @@ -139,7 +139,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -152,7 +152,7 @@ bool Axis1Placement::LoadONBrep(ON_Brep *brep) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } Modified: brlcad/trunk/src/conv/step/Axis1Placement.h =================================================================== --- brlcad/trunk/src/conv/step/Axis1Placement.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/Axis1Placement.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -45,7 +45,7 @@ public: Axis1Placement(); virtual ~Axis1Placement(); - Axis1Placement(STEPWrapper *sw,int STEPid); + Axis1Placement(STEPWrapper *sw,int step_id); const double *GetAxis(int i); virtual const double *GetOrigin(); virtual const double *GetNormal(); Modified: brlcad/trunk/src/conv/step/Axis2Placement.cpp =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/Axis2Placement.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -48,9 +48,9 @@ value = NULL; } -Axis2Placement::Axis2Placement(STEPWrapper *sw,int STEPid) { +Axis2Placement::Axis2Placement(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; value = NULL; } @@ -100,15 +100,15 @@ void Axis2Placement::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; if (type == AXIS2_PLACEMENT_2D) { - TAB(level+1); cout << "Type:" << axis2_placement_type_names[type] << " Value:" << endl; + TAB(level+1); std::cout << "Type:" << axis2_placement_type_names[type] << " Value:" << std::endl; value->Print(level+1); } else if (type == AXIS2_PLACEMENT_2D) { - TAB(level+1); cout << "Type:" << axis2_placement_type_names[type] << " Value:" << endl; + TAB(level+1); std::cout << "Type:" << axis2_placement_type_names[type] << " Value:" << std::endl; value->Print(level+1); } } @@ -121,7 +121,7 @@ Factory::AddObject(object); if (!object->Load(sw, (SCLP23(Select) *)sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/Axis2Placement.h =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/Axis2Placement.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -47,7 +47,7 @@ public: Axis2Placement(); virtual ~Axis2Placement(); - Axis2Placement(STEPWrapper *sw,int STEPid); + Axis2Placement(STEPWrapper *sw,int step_id); const double *GetOrigin(); const double *GetNormal(); const double *GetXAxis(); Modified: brlcad/trunk/src/conv/step/Axis2Placement2D.cpp =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement2D.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/Axis2Placement2D.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -42,9 +42,9 @@ ref_direction = NULL; } -Axis2Placement2D::Axis2Placement2D(STEPWrapper *sw,int STEPid) { +Axis2Placement2D::Axis2Placement2D(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; ref_direction = NULL; } @@ -116,7 +116,7 @@ id = sse->STEPfile_id; if ( !Placement::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Placement." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Placement." << std::endl; return false; } @@ -140,14 +140,14 @@ void Axis2Placement2D::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << endl; + TAB(level); std::cout << CLASSNAME << ":" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "ref_direction:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "ref_direction:" << std::endl; if (ref_direction) ref_direction->Print(level+1); - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; Placement::Print(level+1); } @@ -161,7 +161,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -174,7 +174,7 @@ bool Axis2Placement2D::LoadONBrep(ON_Brep *brep) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } Modified: brlcad/trunk/src/conv/step/Axis2Placement2D.h =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement2D.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/Axis2Placement2D.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -46,7 +46,7 @@ public: Axis2Placement2D(); virtual ~Axis2Placement2D(); - Axis2Placement2D(STEPWrapper *sw,int STEPid); + Axis2Placement2D(STEPWrapper *sw,int step_id); const double *GetAxis(int i); virtual const double *GetOrigin(); virtual const double *GetNormal(); Modified: brlcad/trunk/src/conv/step/Axis2Placement3D.cpp =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement3D.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/Axis2Placement3D.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -43,9 +43,9 @@ ref_direction = NULL; } -Axis2Placement3D::Axis2Placement3D(STEPWrapper *sw,int STEPid) { +Axis2Placement3D::Axis2Placement3D(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; axis = NULL; ref_direction = NULL; } @@ -99,7 +99,6 @@ void Axis2Placement3D::FirstProjAxis(double *proj,double *zaxis, double *refdir) { double z[3]; - double r[3]; double v[3]; double TOL = 1e-9; @@ -202,7 +201,7 @@ id = sse->STEPfile_id; if ( !Placement::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Placement." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Placement." << std::endl; return false; } @@ -235,20 +234,20 @@ void Axis2Placement3D::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; if (axis) { - TAB(level+1); cout << "axis:" << endl; + TAB(level+1); std::cout << "axis:" << std::endl; axis->Print(level+1); } if (ref_direction) { - TAB(level+1); cout << "ref_direction:" << endl; + TAB(level+1); std::cout << "ref_direction:" << std::endl; ref_direction->Print(level+1); } - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; Placement::Print(level+1); } @@ -261,7 +260,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -275,7 +274,7 @@ Axis2Placement3D::LoadONBrep(ON_Brep *brep) { //TODO: check other axis2placement3d usage notice being loaded from advanced brep in some instances - //cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + //cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return true; } Modified: brlcad/trunk/src/conv/step/Axis2Placement3D.h =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement3D.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/Axis2Placement3D.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -47,7 +47,7 @@ public: Axis2Placement3D(); virtual ~Axis2Placement3D(); - Axis2Placement3D(STEPWrapper *sw,int STEPid); + Axis2Placement3D(STEPWrapper *sw,int step_id); const double *GetAxis(int i); virtual const double *GetOrigin(); virtual const double *GetNormal(); Modified: brlcad/trunk/src/conv/step/BSplineCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/BSplineCurve.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/BSplineCurve.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -49,9 +49,9 @@ id = 0; } -BSplineCurve::BSplineCurve(STEPWrapper *sw,int STEPid) { +BSplineCurve::BSplineCurve(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } BSplineCurve::~BSplineCurve() { @@ -74,7 +74,7 @@ id = sse->STEPfile_id; if ( !BoundedCurve::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BoundedCurve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BoundedCurve." << std::endl; return false; } @@ -92,7 +92,7 @@ control_points_list.push_back(aCP); } else { - cerr << CLASSNAME << ": Unhandled entity in attribute 'control_points_list'." << endl; + std::cerr << CLASSNAME << ": Unhandled entity in attribute 'control_points_list'." << std::endl; return false; } } @@ -113,35 +113,35 @@ const double * BSplineCurve::PointAtEnd() { - cerr << CLASSNAME << ": Error: virtual function PointAtEnd() not implemented for this type of curve."; + std::cerr << CLASSNAME << ": Error: virtual function PointAtEnd() not implemented for this type of curve."; return NULL; } const double * BSplineCurve::PointAtStart() { - cerr << CLASSNAME << ": Error: virtual function PointAtStart() not implemented for this type of curve."; + std::cerr << CLASSNAME << ": Error: virtual function PointAtStart() not implemented for this type of curve."; return NULL; } */ void BSplineCurve::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "control_points_list:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "control_points_list:" << std::endl; LIST_OF_POINTS::iterator i; for(i=control_points_list.begin();i!=control_points_list.end();i++) { (*i)->Print(level+1); } - TAB(level+1); cout << "closed_curve:" << step->getLogicalString((SCLLOG_H(Logical))closed_curve) << endl; - TAB(level+1); cout << "self_intersect:" << step->getLogicalString((SCLLOG_H(Logical))self_intersect) << endl; - TAB(level+1); cout << "degree:" << degree << endl; - TAB(level+1); cout << "curve_form:" << B_spline_curve_form_string[curve_form] << endl; + TAB(level+1); std::cout << "closed_curve:" << step->getLogicalString((SCLLOG_H(Logical))closed_curve) << std::endl; + TAB(level+1); std::cout << "self_intersect:" << step->getLogicalString((SCLLOG_H(Logical))self_intersect) << std::endl; + TAB(level+1); std::cout << "degree:" << degree << std::endl; + TAB(level+1); std::cout << "curve_form:" << B_spline_curve_form_string[curve_form] << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; BoundedCurve::Print(level+1); } @@ -154,7 +154,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -173,24 +173,24 @@ AddPolyLine(brep); return true; } else if ( curve_form == B_spline_curve_form__circular_arc ) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } else if ( curve_form == B_spline_curve_form__elliptic_arc ) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } else if ( curve_form == B_spline_curve_form__parabolic_arc ) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } else if ( curve_form == B_spline_curve_form__hyperbolic_arc ) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } else { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } } - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << " id: " << id << std::endl; return false; } */ Modified: brlcad/trunk/src/conv/step/BSplineCurve.h =================================================================== --- brlcad/trunk/src/conv/step/BSplineCurve.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/BSplineCurve.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -52,7 +52,7 @@ public: BSplineCurve(); virtual ~BSplineCurve(); - BSplineCurve(STEPWrapper *sw,int STEPid); + BSplineCurve(STEPWrapper *sw,int step_id); void AddPolyLine(ON_Brep *brep); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); Modified: brlcad/trunk/src/conv/step/BSplineCurveWithKnots.cpp =================================================================== --- brlcad/trunk/src/conv/step/BSplineCurveWithKnots.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/BSplineCurveWithKnots.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -47,9 +47,9 @@ id = 0; } -BSplineCurveWithKnots::BSplineCurveWithKnots(STEPWrapper *sw,int STEPid) { +BSplineCurveWithKnots::BSplineCurveWithKnots(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } BSplineCurveWithKnots::~BSplineCurveWithKnots() { @@ -62,7 +62,7 @@ // load base class attributes if ( !BSplineCurve::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BSplineCurve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BSplineCurve." << std::endl; return false; } @@ -82,7 +82,7 @@ in = (IntNode *)in->NextNode(); } } else { - cout << CLASSNAME << ": Error loading BSplineCurveWithKnots(knot_multiplicities)." << endl; + std::cout << CLASSNAME << ": Error loading BSplineCurveWithKnots(knot_multiplicities)." << std::endl; return false; } } @@ -98,7 +98,7 @@ rn = (RealNode *)rn->NextNode(); } } else { - cout << CLASSNAME << ": Error loading BSplineCurveWithKnots(knots)." << endl; + std::cout << CLASSNAME << ": Error loading BSplineCurveWithKnots(knots)." << std::endl; return false; } } @@ -112,27 +112,27 @@ void BSplineCurveWithKnots::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "knot_multiplicities:"; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "knot_multiplicities:"; LIST_OF_INTEGERS::iterator ii; for(ii=knot_multiplicities.begin();ii!=knot_multiplicities.end();ii++) { - cout << " " << (*ii); + std::cout << " " << (*ii); } - cout << endl; + std::cout << std::endl; - TAB(level+1); cout << "knots:"; + TAB(level+1); std::cout << "knots:"; LIST_OF_REALS::iterator ir; for(ir=knots.begin();ir!=knots.end();ir++) { - cout << " " << (*ir); + std::cout << " " << (*ir); } - cout << endl; + std::cout << std::endl; - TAB(level+1); cout << "knot_spec:" << Knot_type_string[knot_spec] << endl; + TAB(level+1); std::cout << "knot_spec:" << Knot_type_string[knot_spec] << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; BSplineCurve::Print(level+1); } @@ -145,7 +145,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/BSplineCurveWithKnots.h =================================================================== --- brlcad/trunk/src/conv/step/BSplineCurveWithKnots.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/BSplineCurveWithKnots.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -49,7 +49,7 @@ public: BSplineCurveWithKnots(); virtual ~BSplineCurveWithKnots(); - BSplineCurveWithKnots(STEPWrapper *sw,int STEPid); + BSplineCurveWithKnots(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/BSplineSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/BSplineSurface.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/BSplineSurface.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -54,9 +54,9 @@ control_points_list = NULL; } -BSplineSurface::BSplineSurface(STEPWrapper *sw,int STEPid) { +BSplineSurface::BSplineSurface(STEPWrapper *sw,int step_id) { step=sw; - id = STEPid; + id = step_id; control_points_list = NULL; } @@ -80,7 +80,7 @@ id = sse->STEPfile_id; if ( !BoundedSurface::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BoundedSurface." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BoundedSurface." << std::endl; return false; } @@ -104,31 +104,31 @@ void BSplineSurface::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "control_points:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "control_points:" << std::endl; LIST_OF_LIST_OF_POINTS::iterator i; int cnt=0; for(i=control_points_list->begin(); i != control_points_list->end(); ++i) { LIST_OF_POINTS::iterator j; LIST_OF_POINTS *p = *i; - TAB(level+1); cout << "line " << cnt++ << ":" << endl; + TAB(level+1); std::cout << "line " << cnt++ << ":" << std::endl; for(j=p->begin(); j != p->end(); ++j) { (*j)->Print(level+1); } } - TAB(level+1); cout << "u_degree:" << u_degree << endl; - TAB(level+1); cout << "v_degree:" << v_degree << endl; + TAB(level+1); std::cout << "u_degree:" << u_degree << std::endl; + TAB(level+1); std::cout << "v_degree:" << v_degree << std::endl; - TAB(level+1); cout << "u_closed:" << step->getLogicalString((SCLLOG_H(Logical))u_closed) << endl; - TAB(level+1); cout << "v_closed:" << step->getLogicalString((SCLLOG_H(Logical))v_closed) << endl; - TAB(level+1); cout << "self_intersect:" << step->getLogicalString((SCLLOG_H(Logical))self_intersect) << endl; - TAB(level+1); cout << "surface_form:" << B_spline_surface_form_string[surface_form] << endl; + TAB(level+1); std::cout << "u_closed:" << step->getLogicalString((SCLLOG_H(Logical))u_closed) << std::endl; + TAB(level+1); std::cout << "v_closed:" << step->getLogicalString((SCLLOG_H(Logical))v_closed) << std::endl; + TAB(level+1); std::cout << "self_intersect:" << step->getLogicalString((SCLLOG_H(Logical))self_intersect) << std::endl; + TAB(level+1); std::cout << "surface_form:" << B_spline_surface_form_string[surface_form] << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; BoundedSurface::Print(level+1); } @@ -141,7 +141,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/BSplineSurface.h =================================================================== --- brlcad/trunk/src/conv/step/BSplineSurface.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/BSplineSurface.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -58,7 +58,7 @@ public: BSplineSurface(); virtual ~BSplineSurface(); - BSplineSurface(STEPWrapper *sw,int STEPid); + BSplineSurface(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.cpp =================================================================== --- brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -47,9 +47,9 @@ id = 0; } -BSplineSurfaceWithKnots::BSplineSurfaceWithKnots(STEPWrapper *sw,int STEPid) { +BSplineSurfaceWithKnots::BSplineSurfaceWithKnots(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } BSplineSurfaceWithKnots::~BSplineSurfaceWithKnots() { @@ -62,7 +62,7 @@ // load base class attributes if ( !BSplineSurface::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BSplineCurve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BSplineCurve." << std::endl; return false; } @@ -81,7 +81,7 @@ in = (IntNode *)in->NextNode(); } } else { - cout << CLASSNAME << ": Error loading BSplineSurfaceWithKnots(u_multiplicities)." << endl; + std::cout << CLASSNAME << ": Error loading BSplineSurfaceWithKnots(u_multiplicities)." << std::endl; return false; } } @@ -96,7 +96,7 @@ in = (IntNode *)in->NextNode(); } } else { - cout << CLASSNAME << ": Error loading BSplineSurfaceWithKnots(v_multiplicities)." << endl; + std::cout << CLASSNAME << ": Error loading BSplineSurfaceWithKnots(v_multiplicities)." << std::endl; return false; } } @@ -111,7 +111,7 @@ rn = (RealNode *)rn->NextNode(); } } else { - cout << CLASSNAME << ": Error loading BSplineSurfaceWithKnots(knots)." << endl; + std::cout << CLASSNAME << ": Error loading BSplineSurfaceWithKnots(knots)." << std::endl; return false; } } @@ -126,7 +126,7 @@ rn = (RealNode *)rn->NextNode(); } } else { - cout << CLASSNAME << ": Error loading BSplineSurfaceWithKnots(knots)." << endl; + std::cout << CLASSNAME << ": Error loading BSplineSurfaceWithKnots(knots)." << std::endl; return false; } } @@ -140,37 +140,37 @@ void BSplineSurfaceWithKnots::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "u_multiplicities:"; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "u_multiplicities:"; LIST_OF_INTEGERS::iterator ii; for(ii=u_multiplicities.begin();ii!=u_multiplicities.end();ii++) { - cout << " " << (*ii); + std::cout << " " << (*ii); } - cout << endl; - TAB(level+1); cout << "v_multiplicities:"; + std::cout << std::endl; + TAB(level+1); std::cout << "v_multiplicities:"; for(ii=v_multiplicities.begin();ii!=v_multiplicities.end();ii++) { - cout << " " << (*ii); + std::cout << " " << (*ii); } - cout << endl; + std::cout << std::endl; - TAB(level+1); cout << "u_knots:"; + TAB(level+1); std::cout << "u_knots:"; LIST_OF_REALS::iterator ir; for(ir=u_knots.begin();ir!=u_knots.end();ir++) { - cout << " " << (*ir); + std::cout << " " << (*ir); } - cout << endl; - TAB(level+1); cout << "v_knots:"; + std::cout << std::endl; + TAB(level+1); std::cout << "v_knots:"; for(ir=v_knots.begin();ir!=v_knots.end();ir++) { - cout << " " << (*ir); + std::cout << " " << (*ir); } - cout << endl; + std::cout << std::endl; - TAB(level+1); cout << "knot_spec:" << Knot_type_string[knot_spec] << endl; + TAB(level+1); std::cout << "knot_spec:" << Knot_type_string[knot_spec] << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; BSplineSurface::Print(level+1); } STEPEntity * @@ -182,7 +182,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.h =================================================================== --- brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/BSplineSurfaceWithKnots.h 2009-12-29 12:26:28 UTC (rev 37057) @@ -50,7 +50,7 @@ public: BSplineSurfaceWithKnots(); virtual ~BSplineSurfaceWithKnots(); - BSplineSurfaceWithKnots(STEPWrapper *sw,int STEPid); + BSplineSurfaceWithKnots(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/BezierCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/BezierCurve.cpp 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk/src/conv/step/BezierCurve.cpp 2009-12-29 12:26:28 UTC (rev 37057) @@ -39,9 +39,9 @@ id = 0; } -BezierCurve::BezierCurve(STEPWrapper *sw,int STEPid) { +BezierCurve::BezierCurve(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } BezierCurve::~BezierCurve() { @@ -54,7 +54,7 @@ // load base class attributes if ( !BSplineCurve::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BSplineCurve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BSplineCurve." << std::endl; return false; } @@ -63,10 +63,10 @@ void BezierCurve::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; BSplineCurve::Print(level+1); @@ -80,7 +80,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/BezierCurve.h =================================================================== --- brlcad/trunk/src/conv/step/BezierCurve.h 2009-12-29 07:57:40 UTC (rev 37056) +++ brlcad/trunk... [truncated message content] |
From: <ind...@us...> - 2009-12-29 12:29:20
|
Revision: 37058 http://brlcad.svn.sourceforge.net/brlcad/?rev=37058&view=rev Author: indianlarry Date: 2009-12-29 12:29:07 +0000 (Tue, 29 Dec 2009) Log Message: ----------- Start of updates to cleanup compile warnings including cleaned up of some variable shadowing, namespace path additions to standard IO items, cleaned up of some CPP defs in the STEP generated code(will need to address in 'fedex') Modified Paths: -------------- brlcad/trunk/src/conv/step/GeometricRepresentationContext.cpp brlcad/trunk/src/conv/step/GeometricRepresentationContext.h brlcad/trunk/src/conv/step/GeometricRepresentationItem.cpp brlcad/trunk/src/conv/step/GeometricRepresentationItem.h brlcad/trunk/src/conv/step/GlobalUncertaintyAssignedContext.cpp brlcad/trunk/src/conv/step/GlobalUncertaintyAssignedContext.h brlcad/trunk/src/conv/step/GlobalUnitAssignedContext.cpp brlcad/trunk/src/conv/step/GlobalUnitAssignedContext.h brlcad/trunk/src/conv/step/Hyperbola.cpp brlcad/trunk/src/conv/step/Hyperbola.h brlcad/trunk/src/conv/step/IntersectionCurve.cpp brlcad/trunk/src/conv/step/IntersectionCurve.h brlcad/trunk/src/conv/step/LengthContextDependentUnit.cpp brlcad/trunk/src/conv/step/LengthContextDependentUnit.h brlcad/trunk/src/conv/step/LengthConversionBasedUnit.cpp brlcad/trunk/src/conv/step/LengthConversionBasedUnit.h brlcad/trunk/src/conv/step/LengthMeasureWithUnit.cpp brlcad/trunk/src/conv/step/LengthMeasureWithUnit.h brlcad/trunk/src/conv/step/LengthSiUnit.cpp brlcad/trunk/src/conv/step/LengthSiUnit.h brlcad/trunk/src/conv/step/LengthUnit.cpp brlcad/trunk/src/conv/step/LengthUnit.h brlcad/trunk/src/conv/step/Line.cpp brlcad/trunk/src/conv/step/Line.h brlcad/trunk/src/conv/step/Loop.cpp brlcad/trunk/src/conv/step/Loop.h brlcad/trunk/src/conv/step/LuminousIntensityContextDependentUnit.cpp brlcad/trunk/src/conv/step/LuminousIntensityContextDependentUnit.h brlcad/trunk/src/conv/step/LuminousIntensityConversionBasedUnit.cpp brlcad/trunk/src/conv/step/LuminousIntensityConversionBasedUnit.h brlcad/trunk/src/conv/step/LuminousIntensitySiUnit.cpp brlcad/trunk/src/conv/step/LuminousIntensitySiUnit.h brlcad/trunk/src/conv/step/LuminousIntensityUnit.cpp brlcad/trunk/src/conv/step/LuminousIntensityUnit.h Modified: brlcad/trunk/src/conv/step/GeometricRepresentationContext.cpp =================================================================== --- brlcad/trunk/src/conv/step/GeometricRepresentationContext.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/GeometricRepresentationContext.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,9 +38,9 @@ id = 0; } -GeometricRepresentationContext::GeometricRepresentationContext(STEPWrapper *sw,int STEPid) { +GeometricRepresentationContext::GeometricRepresentationContext(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } GeometricRepresentationContext::~GeometricRepresentationContext() { @@ -53,7 +53,7 @@ // load base class attributes if ( !RepresentationContext::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RepresentationContext." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RepresentationContext." << std::endl; return false; } @@ -68,13 +68,13 @@ void GeometricRepresentationContext::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "coordinate_space_dimension:" << coordinate_space_dimension << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "coordinate_space_dimension:" << coordinate_space_dimension << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; RepresentationContext::Print(level+1); } STEPEntity * @@ -86,7 +86,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/GeometricRepresentationContext.h =================================================================== --- brlcad/trunk/src/conv/step/GeometricRepresentationContext.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/GeometricRepresentationContext.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -39,7 +39,7 @@ public: GeometricRepresentationContext(); virtual ~GeometricRepresentationContext(); - GeometricRepresentationContext(STEPWrapper *sw,int STEPid); + GeometricRepresentationContext(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/GeometricRepresentationItem.cpp =================================================================== --- brlcad/trunk/src/conv/step/GeometricRepresentationItem.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/GeometricRepresentationItem.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,9 +38,9 @@ id = 0; } -GeometricRepresentationItem::GeometricRepresentationItem(STEPWrapper *sw,int STEPid) { +GeometricRepresentationItem::GeometricRepresentationItem(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } GeometricRepresentationItem::~GeometricRepresentationItem() { @@ -54,7 +54,7 @@ // load base class attributes if ( !RepresentationItem::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RepresentationItem." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RepresentationItem." << std::endl; return false; } @@ -63,10 +63,10 @@ void GeometricRepresentationItem::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; RepresentationItem::Print(level+1); } @@ -79,7 +79,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -92,7 +92,7 @@ bool GeometricRepresentationItem::LoadONBrep(ON_Brep *brep) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } Modified: brlcad/trunk/src/conv/step/GeometricRepresentationItem.h =================================================================== --- brlcad/trunk/src/conv/step/GeometricRepresentationItem.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/GeometricRepresentationItem.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,7 +38,7 @@ public: GeometricRepresentationItem(); virtual ~GeometricRepresentationItem(); - GeometricRepresentationItem(STEPWrapper *sw,int STEPid); + GeometricRepresentationItem(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/GlobalUncertaintyAssignedContext.cpp =================================================================== --- brlcad/trunk/src/conv/step/GlobalUncertaintyAssignedContext.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/GlobalUncertaintyAssignedContext.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -41,9 +41,9 @@ id = 0; } -GlobalUncertaintyAssignedContext::GlobalUncertaintyAssignedContext(STEPWrapper *sw,int STEPid) { +GlobalUncertaintyAssignedContext::GlobalUncertaintyAssignedContext(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } GlobalUncertaintyAssignedContext::~GlobalUncertaintyAssignedContext() { @@ -65,7 +65,7 @@ // load base class attributes if ( !RepresentationContext::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RepresentationContext." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RepresentationContext." << std::endl; return false; } @@ -83,7 +83,7 @@ uncertainty.push_back(aUMWU); } else { - cerr << CLASSNAME << ": Unhandled entity in attribute 'uncertainty'." << endl; + std::cerr << CLASSNAME << ": Unhandled entity in attribute 'uncertainty'." << std::endl; return false; } } @@ -95,18 +95,18 @@ void GlobalUncertaintyAssignedContext::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "uncertainty(list):" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "uncertainty(list):" << std::endl; LIST_OF_UNCERTAINTY_MEASURE_WITH_UNIT::iterator i; for(i=uncertainty.begin();i!=uncertainty.end();i++) { (*i)->Print(level+1); - cout << endl; + std::cout << std::endl; } - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; RepresentationContext::Print(level+1); } STEPEntity * @@ -118,7 +118,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/GlobalUncertaintyAssignedContext.h =================================================================== --- brlcad/trunk/src/conv/step/GlobalUncertaintyAssignedContext.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/GlobalUncertaintyAssignedContext.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -42,7 +42,7 @@ public: GlobalUncertaintyAssignedContext(); virtual ~GlobalUncertaintyAssignedContext(); - GlobalUncertaintyAssignedContext(STEPWrapper *sw,int STEPid); + GlobalUncertaintyAssignedContext(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/GlobalUnitAssignedContext.cpp =================================================================== --- brlcad/trunk/src/conv/step/GlobalUnitAssignedContext.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/GlobalUnitAssignedContext.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -58,9 +58,9 @@ id = 0; } -GlobalUnitAssignedContext::GlobalUnitAssignedContext(STEPWrapper *sw,int STEPid) { +GlobalUnitAssignedContext::GlobalUnitAssignedContext(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } GlobalUnitAssignedContext::~GlobalUnitAssignedContext() { @@ -93,11 +93,12 @@ LengthContextDependentUnit *cd = dynamic_cast<LengthContextDependentUnit *>(*i); if (cd != NULL) { //found conversion based length unit - cerr << "found context dependent length unit" << endl; + std::cerr << "found context dependent length unit" << std::endl; return 1.0; } i++; } + return 1.0; //assume no conversion factor } double @@ -118,11 +119,12 @@ PlaneAngleContextDependentUnit *cd = dynamic_cast<PlaneAngleContextDependentUnit *>(*i); if (cd != NULL) { //found conversion based length unit - cerr << "found context dependent length unit" << endl; + std::cerr << "found context dependent length unit" << std::endl; return 1.0; } i++; } + return 1.0; //assume no conversion factor } double @@ -138,17 +140,18 @@ SolidAngleConversionBasedUnit *cb = dynamic_cast<SolidAngleConversionBasedUnit *>(*i); if (cb != NULL) { //found conversion based length unit - cerr << "found SI length unit" << endl; + std::cerr << "found SI length unit" << std::endl; return 1.0; } SolidAngleContextDependentUnit *cd = dynamic_cast<SolidAngleContextDependentUnit *>(*i); if (cd != NULL) { //found conversion based length unit - cerr << "found context dependent length unit" << endl; + std::cerr << "found context dependent length unit" << std::endl; return 1.0; } i++; } + return 1.0; //assume no conversion factor } bool @@ -158,7 +161,7 @@ // load base class attributes if ( !RepresentationContext::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RepresentationContext." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RepresentationContext." << std::endl; return false; } @@ -186,7 +189,7 @@ } else { l->clear(); delete l; - cout << CLASSNAME << ":Error unhandled unit type in units list." << endl; + std::cout << CLASSNAME << ":Error unhandled unit type in units list." << std::endl; return false; } } @@ -199,18 +202,18 @@ void GlobalUnitAssignedContext::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "units(list):" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "units(list):" << std::endl; LIST_OF_UNITS::iterator i; for(i=units.begin();i!=units.end();i++) { (*i)->Print(level+1); - cout << endl; + std::cout << std::endl; } - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; RepresentationContext::Print(level+1); } STEPEntity * @@ -222,7 +225,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/GlobalUnitAssignedContext.h =================================================================== --- brlcad/trunk/src/conv/step/GlobalUnitAssignedContext.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/GlobalUnitAssignedContext.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -42,7 +42,7 @@ public: GlobalUnitAssignedContext(); virtual ~GlobalUnitAssignedContext(); - GlobalUnitAssignedContext(STEPWrapper *sw,int STEPid); + GlobalUnitAssignedContext(STEPWrapper *sw,int step_id); double GetLengthConversionFactor(); double GetPlaneAngleConversionFactor(); double GetSolidAngleConversionFactor(); Modified: brlcad/trunk/src/conv/step/Hyperbola.cpp =================================================================== --- brlcad/trunk/src/conv/step/Hyperbola.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/Hyperbola.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -39,9 +39,9 @@ id = 0; } -Hyperbola::Hyperbola(STEPWrapper *sw,int STEPid) { +Hyperbola::Hyperbola(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } Hyperbola::~Hyperbola() { @@ -53,7 +53,7 @@ id = sse->STEPfile_id; if ( !Conic::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Conic." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Conic." << std::endl; return false; } @@ -69,14 +69,14 @@ void Hyperbola::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "semi_axis:" << semi_axis << endl; - TAB(level+1); cout << "semi_imag_axis:" << semi_imag_axis << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "semi_axis:" << semi_axis << std::endl; + TAB(level+1); std::cout << "semi_imag_axis:" << semi_imag_axis << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; Conic::Print(level+1); } STEPEntity * @@ -88,7 +88,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/Hyperbola.h =================================================================== --- brlcad/trunk/src/conv/step/Hyperbola.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/Hyperbola.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,7 +38,7 @@ double semi_imag_axis; Hyperbola(); - Hyperbola(STEPWrapper *sw,int STEPid); + Hyperbola(STEPWrapper *sw,int step_id); public: virtual ~Hyperbola(); Modified: brlcad/trunk/src/conv/step/IntersectionCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/IntersectionCurve.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/IntersectionCurve.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,9 +38,9 @@ id = 0; } -IntersectionCurve::IntersectionCurve(STEPWrapper *sw,int STEPid) { +IntersectionCurve::IntersectionCurve(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } IntersectionCurve::~IntersectionCurve() { @@ -52,7 +52,7 @@ id = sse->STEPfile_id; if ( !SurfaceCurve::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::SurfaceCurve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::SurfaceCurve." << std::endl; return false; } @@ -61,10 +61,10 @@ void IntersectionCurve::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; SurfaceCurve::Print(level+1); } @@ -77,7 +77,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -90,7 +90,7 @@ bool IntersectionCurve::LoadONBrep(ON_Brep *brep) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } Modified: brlcad/trunk/src/conv/step/IntersectionCurve.h =================================================================== --- brlcad/trunk/src/conv/step/IntersectionCurve.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/IntersectionCurve.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,7 +38,7 @@ public: IntersectionCurve(); virtual ~IntersectionCurve(); - IntersectionCurve(STEPWrapper *sw,int STEPid); + IntersectionCurve(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/LengthContextDependentUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/LengthContextDependentUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LengthContextDependentUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,9 +38,9 @@ id = 0; } -LengthContextDependentUnit::LengthContextDependentUnit(STEPWrapper *sw,int STEPid) { +LengthContextDependentUnit::LengthContextDependentUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } LengthContextDependentUnit::~LengthContextDependentUnit() { @@ -54,11 +54,11 @@ // load base class attributes if ( !LengthUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ContextDependentUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -67,10 +67,10 @@ void LengthContextDependentUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; LengthUnit::Print(level+1); ContextDependentUnit::Print(level+1); @@ -84,7 +84,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/LengthContextDependentUnit.h =================================================================== --- brlcad/trunk/src/conv/step/LengthContextDependentUnit.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LengthContextDependentUnit.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -39,7 +39,7 @@ public: LengthContextDependentUnit(); virtual ~LengthContextDependentUnit(); - LengthContextDependentUnit(STEPWrapper *sw,int STEPid); + LengthContextDependentUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/LengthConversionBasedUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/LengthConversionBasedUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LengthConversionBasedUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -41,9 +41,9 @@ id = 0; } -LengthConversionBasedUnit::LengthConversionBasedUnit(STEPWrapper *sw,int STEPid) { +LengthConversionBasedUnit::LengthConversionBasedUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } LengthConversionBasedUnit::~LengthConversionBasedUnit() { @@ -57,11 +57,11 @@ // load base class attributes if ( !LengthUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ConversionBasedUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -70,10 +70,10 @@ void LengthConversionBasedUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; LengthUnit::Print(level+1); ConversionBasedUnit::Print(level+1); @@ -87,7 +87,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/LengthConversionBasedUnit.h =================================================================== --- brlcad/trunk/src/conv/step/LengthConversionBasedUnit.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LengthConversionBasedUnit.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -39,7 +39,7 @@ public: LengthConversionBasedUnit(); virtual ~LengthConversionBasedUnit(); - LengthConversionBasedUnit(STEPWrapper *sw,int STEPid); + LengthConversionBasedUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/LengthMeasureWithUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/LengthMeasureWithUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LengthMeasureWithUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -42,9 +42,9 @@ id = 0; } -LengthMeasureWithUnit::LengthMeasureWithUnit(STEPWrapper *sw,int STEPid) { +LengthMeasureWithUnit::LengthMeasureWithUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } LengthMeasureWithUnit::~LengthMeasureWithUnit() { @@ -58,7 +58,7 @@ // load base class attributes if ( !MeasureWithUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::" << CLASSNAME << endl; + std::cout << CLASSNAME << ":Error loading base class ::" << CLASSNAME << std::endl; return false; } return true; @@ -66,11 +66,11 @@ void LengthMeasureWithUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; MeasureWithUnit::Print(level+1); } @@ -83,7 +83,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/LengthMeasureWithUnit.h =================================================================== --- brlcad/trunk/src/conv/step/LengthMeasureWithUnit.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LengthMeasureWithUnit.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,7 +38,7 @@ public: LengthMeasureWithUnit(); virtual ~LengthMeasureWithUnit(); - LengthMeasureWithUnit(STEPWrapper *sw,int STEPid); + LengthMeasureWithUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/LengthSiUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/LengthSiUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LengthSiUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,9 +38,9 @@ id = 0; } -LengthSiUnit::LengthSiUnit(STEPWrapper *sw,int STEPid) { +LengthSiUnit::LengthSiUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } LengthSiUnit::~LengthSiUnit() { @@ -54,11 +54,11 @@ // load base class attributes if ( !LengthUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !SiUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -67,10 +67,10 @@ void LengthSiUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; LengthUnit::Print(level+1); SiUnit::Print(level+1); @@ -84,7 +84,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/LengthSiUnit.h =================================================================== --- brlcad/trunk/src/conv/step/LengthSiUnit.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LengthSiUnit.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -39,7 +39,7 @@ public: LengthSiUnit(); virtual ~LengthSiUnit(); - LengthSiUnit(STEPWrapper *sw,int STEPid); + LengthSiUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/LengthUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/LengthUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LengthUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,9 +38,9 @@ id = 0; } -LengthUnit::LengthUnit(STEPWrapper *sw,int STEPid) { +LengthUnit::LengthUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } LengthUnit::~LengthUnit() { @@ -54,7 +54,7 @@ // load base class attributes if ( !NamedUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -63,10 +63,10 @@ void LengthUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; NamedUnit::Print(level+1); } @@ -79,7 +79,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/LengthUnit.h =================================================================== --- brlcad/trunk/src/conv/step/LengthUnit.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LengthUnit.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,7 +38,7 @@ public: LengthUnit(); virtual ~LengthUnit(); - LengthUnit(STEPWrapper *sw,int STEPid); + LengthUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/Line.cpp =================================================================== --- brlcad/trunk/src/conv/step/Line.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/Line.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -45,9 +45,9 @@ dir = NULL; } -Line::Line(STEPWrapper *sw,int STEPid) { +Line::Line(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; pnt = NULL; dir = NULL; } @@ -78,7 +78,7 @@ id = sse->STEPfile_id; if ( !Curve::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Curve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Curve." << std::endl; return false; } @@ -100,27 +100,27 @@ const double * Line::PointAtEnd() { - cerr << CLASSNAME << ": Error: virtual function PointAtEnd() not implemented for this type of curve."; + std::cerr << CLASSNAME << ": Error: virtual function PointAtEnd() not implemented for this type of curve."; return NULL; } const double * Line::PointAtStart() { - cerr << CLASSNAME << ": Error: virtual function PointAtStart() not implemented for this type of curve."; + std::cerr << CLASSNAME << ": Error: virtual function PointAtStart() not implemented for this type of curve."; return NULL; } */ void Line::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; pnt->Print(level+1); dir->Print(level+1); - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; Curve::Print(level+1); } STEPEntity * @@ -132,7 +132,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/Line.h =================================================================== --- brlcad/trunk/src/conv/step/Line.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/Line.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -43,7 +43,7 @@ public: Line(); virtual ~Line(); - Line(STEPWrapper *sw,int STEPid); + Line(STEPWrapper *sw,int step_id); virtual curve_type CurveType() { return LINE; }; void StartPoint(double *p); void EndPoint(double *p); Modified: brlcad/trunk/src/conv/step/Loop.cpp =================================================================== --- brlcad/trunk/src/conv/step/Loop.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/Loop.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,9 +38,9 @@ id = 0; } -Loop::Loop(STEPWrapper *sw,int STEPid) { +Loop::Loop(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } Loop::~Loop() { @@ -53,7 +53,7 @@ // load base class attributes if ( !TopologicalRepresentationItem::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::TopologicalRepresentationItem." << endl; + std::cout << CLASSNAME << ":Error loading base class ::TopologicalRepresentationItem." << std::endl; return false; } @@ -62,10 +62,10 @@ void Loop::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; TopologicalRepresentationItem::Print(level+1); } @@ -78,7 +78,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -96,7 +96,7 @@ bool Loop::LoadONBrep(ON_Brep *brep) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } Modified: brlcad/trunk/src/conv/step/Loop.h =================================================================== --- brlcad/trunk/src/conv/step/Loop.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/Loop.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -42,7 +42,7 @@ public: Loop(); virtual ~Loop(); - Loop(STEPWrapper *sw,int STEPid); + Loop(STEPWrapper *sw,int step_id); virtual ON_BoundingBox *GetEdgeBounds(ON_Brep *brep); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); Modified: brlcad/trunk/src/conv/step/LuminousIntensityContextDependentUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/LuminousIntensityContextDependentUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LuminousIntensityContextDependentUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,9 +38,9 @@ id = 0; } -LuminousIntensityContextDependentUnit::LuminousIntensityContextDependentUnit(STEPWrapper *sw,int STEPid) { +LuminousIntensityContextDependentUnit::LuminousIntensityContextDependentUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } LuminousIntensityContextDependentUnit::~LuminousIntensityContextDependentUnit() { @@ -54,11 +54,11 @@ // load base class attributes if ( !LuminousIntensityUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ContextDependentUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -67,10 +67,10 @@ void LuminousIntensityContextDependentUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; LuminousIntensityUnit::Print(level+1); ContextDependentUnit::Print(level+1); @@ -84,7 +84,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/LuminousIntensityContextDependentUnit.h =================================================================== --- brlcad/trunk/src/conv/step/LuminousIntensityContextDependentUnit.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LuminousIntensityContextDependentUnit.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -39,7 +39,7 @@ public: LuminousIntensityContextDependentUnit(); virtual ~LuminousIntensityContextDependentUnit(); - LuminousIntensityContextDependentUnit(STEPWrapper *sw,int STEPid); + LuminousIntensityContextDependentUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/LuminousIntensityConversionBasedUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/LuminousIntensityConversionBasedUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LuminousIntensityConversionBasedUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -41,9 +41,9 @@ id = 0; } -LuminousIntensityConversionBasedUnit::LuminousIntensityConversionBasedUnit(STEPWrapper *sw,int STEPid) { +LuminousIntensityConversionBasedUnit::LuminousIntensityConversionBasedUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } LuminousIntensityConversionBasedUnit::~LuminousIntensityConversionBasedUnit() { @@ -57,11 +57,11 @@ // load base class attributes if ( !LuminousIntensityUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ConversionBasedUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -70,10 +70,10 @@ void LuminousIntensityConversionBasedUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; LuminousIntensityUnit::Print(level+1); ConversionBasedUnit::Print(level+1); @@ -87,7 +87,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/LuminousIntensityConversionBasedUnit.h =================================================================== --- brlcad/trunk/src/conv/step/LuminousIntensityConversionBasedUnit.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LuminousIntensityConversionBasedUnit.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -39,7 +39,7 @@ public: LuminousIntensityConversionBasedUnit(); virtual ~LuminousIntensityConversionBasedUnit(); - LuminousIntensityConversionBasedUnit(STEPWrapper *sw,int STEPid); + LuminousIntensityConversionBasedUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/LuminousIntensitySiUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/LuminousIntensitySiUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LuminousIntensitySiUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,9 +38,9 @@ id = 0; } -LuminousIntensitySiUnit::LuminousIntensitySiUnit(STEPWrapper *sw,int STEPid) { +LuminousIntensitySiUnit::LuminousIntensitySiUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } LuminousIntensitySiUnit::~LuminousIntensitySiUnit() { @@ -54,11 +54,11 @@ // load base class attributes if ( !LuminousIntensityUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !SiUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -67,10 +67,10 @@ void LuminousIntensitySiUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; LuminousIntensityUnit::Print(level+1); SiUnit::Print(level+1); @@ -84,7 +84,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/LuminousIntensitySiUnit.h =================================================================== --- brlcad/trunk/src/conv/step/LuminousIntensitySiUnit.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LuminousIntensitySiUnit.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -39,7 +39,7 @@ public: LuminousIntensitySiUnit(); virtual ~LuminousIntensitySiUnit(); - LuminousIntensitySiUnit(STEPWrapper *sw,int STEPid); + LuminousIntensitySiUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/LuminousIntensityUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/LuminousIntensityUnit.cpp 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LuminousIntensityUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,9 +38,9 @@ id = 0; } -LuminousIntensityUnit::LuminousIntensityUnit(STEPWrapper *sw,int STEPid) { +LuminousIntensityUnit::LuminousIntensityUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } LuminousIntensityUnit::~LuminousIntensityUnit() { @@ -54,7 +54,7 @@ // load base class attributes if ( !NamedUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -63,10 +63,10 @@ void LuminousIntensityUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; NamedUnit::Print(level+1); } STEPEntity * @@ -78,7 +78,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/LuminousIntensityUnit.h =================================================================== --- brlcad/trunk/src/conv/step/LuminousIntensityUnit.h 2009-12-29 12:26:28 UTC (rev 37057) +++ brlcad/trunk/src/conv/step/LuminousIntensityUnit.h 2009-12-29 12:29:07 UTC (rev 37058) @@ -38,7 +38,7 @@ public: LuminousIntensityUnit(); virtual ~LuminousIntensityUnit(); - LuminousIntensityUnit(STEPWrapper *sw,int STEPid); + LuminousIntensityUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ind...@us...> - 2009-12-29 13:19:23
|
Revision: 37060 http://brlcad.svn.sourceforge.net/brlcad/?rev=37060&view=rev Author: indianlarry Date: 2009-12-29 12:35:59 +0000 (Tue, 29 Dec 2009) Log Message: ----------- Start of updates to cleanup compile warnings including cleaned up of some variable shadowing, namespace path additions to standard IO items, cleaned up of some CPP defs in the STEP generated code(will need to address in 'fedex') Modified Paths: -------------- brlcad/trunk/src/conv/step/QuasiUniformCurve.cpp brlcad/trunk/src/conv/step/QuasiUniformCurve.h brlcad/trunk/src/conv/step/QuasiUniformSurface.cpp brlcad/trunk/src/conv/step/QuasiUniformSurface.h brlcad/trunk/src/conv/step/RatioContextDependentUnit.cpp brlcad/trunk/src/conv/step/RatioContextDependentUnit.h brlcad/trunk/src/conv/step/RatioConversionBasedUnit.cpp brlcad/trunk/src/conv/step/RatioConversionBasedUnit.h brlcad/trunk/src/conv/step/RatioSiUnit.cpp brlcad/trunk/src/conv/step/RatioSiUnit.h brlcad/trunk/src/conv/step/RatioUnit.cpp brlcad/trunk/src/conv/step/RatioUnit.h brlcad/trunk/src/conv/step/RationalBSplineCurve.cpp brlcad/trunk/src/conv/step/RationalBSplineCurve.h brlcad/trunk/src/conv/step/RationalBSplineCurveWithKnots.cpp brlcad/trunk/src/conv/step/RationalBSplineCurveWithKnots.h brlcad/trunk/src/conv/step/RationalBSplineSurface.cpp brlcad/trunk/src/conv/step/RationalBSplineSurface.h brlcad/trunk/src/conv/step/RationalBSplineSurfaceWithKnots.cpp brlcad/trunk/src/conv/step/RationalBSplineSurfaceWithKnots.h brlcad/trunk/src/conv/step/RationalBezierCurve.cpp brlcad/trunk/src/conv/step/RationalBezierCurve.h brlcad/trunk/src/conv/step/RationalBezierSurface.cpp brlcad/trunk/src/conv/step/RationalBezierSurface.h brlcad/trunk/src/conv/step/RationalQuasiUniformCurve.cpp brlcad/trunk/src/conv/step/RationalQuasiUniformCurve.h brlcad/trunk/src/conv/step/RationalQuasiUniformSurface.cpp brlcad/trunk/src/conv/step/RationalQuasiUniformSurface.h brlcad/trunk/src/conv/step/RationalUniformCurve.cpp brlcad/trunk/src/conv/step/RationalUniformCurve.h brlcad/trunk/src/conv/step/RationalUniformSurface.cpp brlcad/trunk/src/conv/step/RationalUniformSurface.h brlcad/trunk/src/conv/step/RectangularCompositeSurface.cpp brlcad/trunk/src/conv/step/RectangularCompositeSurface.h brlcad/trunk/src/conv/step/RectangularTrimmedSurface.cpp brlcad/trunk/src/conv/step/RectangularTrimmedSurface.h brlcad/trunk/src/conv/step/Representation.cpp brlcad/trunk/src/conv/step/Representation.h brlcad/trunk/src/conv/step/RepresentationContext.cpp brlcad/trunk/src/conv/step/RepresentationContext.h brlcad/trunk/src/conv/step/RepresentationItem.cpp brlcad/trunk/src/conv/step/RepresentationItem.h brlcad/trunk/src/conv/step/STEPEntity.cpp brlcad/trunk/src/conv/step/STEPEntity.h brlcad/trunk/src/conv/step/STEPWrapper.cpp brlcad/trunk/src/conv/step/STEPWrapper.h brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.h brlcad/trunk/src/conv/step/SeamCurve.cpp brlcad/trunk/src/conv/step/SeamCurve.h brlcad/trunk/src/conv/step/ShapeRepresentation.cpp brlcad/trunk/src/conv/step/ShapeRepresentation.h brlcad/trunk/src/conv/step/SiUnit.cpp brlcad/trunk/src/conv/step/SiUnit.h brlcad/trunk/src/conv/step/SolidAngleContextDependentUnit.cpp brlcad/trunk/src/conv/step/SolidAngleContextDependentUnit.h brlcad/trunk/src/conv/step/SolidAngleConversionBasedUnit.cpp brlcad/trunk/src/conv/step/SolidAngleConversionBasedUnit.h brlcad/trunk/src/conv/step/SolidAngleSiUnit.cpp brlcad/trunk/src/conv/step/SolidAngleSiUnit.h brlcad/trunk/src/conv/step/SolidAngleUnit.cpp brlcad/trunk/src/conv/step/SolidAngleUnit.h brlcad/trunk/src/conv/step/SolidModel.cpp brlcad/trunk/src/conv/step/SolidModel.h brlcad/trunk/src/conv/step/SphericalSurface.cpp brlcad/trunk/src/conv/step/SphericalSurface.h brlcad/trunk/src/conv/step/Surface.cpp brlcad/trunk/src/conv/step/Surface.h brlcad/trunk/src/conv/step/SurfaceCurve.cpp brlcad/trunk/src/conv/step/SurfaceCurve.h brlcad/trunk/src/conv/step/SurfaceOfLinearExtrusion.cpp brlcad/trunk/src/conv/step/SurfaceOfLinearExtrusion.h brlcad/trunk/src/conv/step/SurfaceOfRevolution.cpp brlcad/trunk/src/conv/step/SurfaceOfRevolution.h brlcad/trunk/src/conv/step/SurfacePatch.cpp brlcad/trunk/src/conv/step/SurfacePatch.h brlcad/trunk/src/conv/step/SurfaceReplica.cpp brlcad/trunk/src/conv/step/SurfaceReplica.h brlcad/trunk/src/conv/step/SweptSurface.cpp brlcad/trunk/src/conv/step/SweptSurface.h brlcad/trunk/src/conv/step/ThermodynamicTemperatureContextDependentUnit.cpp brlcad/trunk/src/conv/step/ThermodynamicTemperatureContextDependentUnit.h brlcad/trunk/src/conv/step/ThermodynamicTemperatureConversionBasedUnit.cpp brlcad/trunk/src/conv/step/ThermodynamicTemperatureConversionBasedUnit.h brlcad/trunk/src/conv/step/ThermodynamicTemperatureSiUnit.cpp brlcad/trunk/src/conv/step/ThermodynamicTemperatureSiUnit.h brlcad/trunk/src/conv/step/ThermodynamicTemperatureUnit.cpp brlcad/trunk/src/conv/step/ThermodynamicTemperatureUnit.h brlcad/trunk/src/conv/step/TimeContextDependentUnit.cpp brlcad/trunk/src/conv/step/TimeContextDependentUnit.h brlcad/trunk/src/conv/step/TimeConversionBasedUnit.cpp brlcad/trunk/src/conv/step/TimeConversionBasedUnit.h brlcad/trunk/src/conv/step/TimeSiUnit.cpp brlcad/trunk/src/conv/step/TimeSiUnit.h brlcad/trunk/src/conv/step/TimeUnit.cpp brlcad/trunk/src/conv/step/TimeUnit.h brlcad/trunk/src/conv/step/TopologicalRepresentationItem.cpp brlcad/trunk/src/conv/step/TopologicalRepresentationItem.h brlcad/trunk/src/conv/step/ToroidalSurface.cpp brlcad/trunk/src/conv/step/ToroidalSurface.h brlcad/trunk/src/conv/step/TrimmedCurve.cpp brlcad/trunk/src/conv/step/TrimmedCurve.h brlcad/trunk/src/conv/step/TrimmingSelect.cpp brlcad/trunk/src/conv/step/TrimmingSelect.h brlcad/trunk/src/conv/step/UncertaintyMeasureWithUnit.cpp brlcad/trunk/src/conv/step/UncertaintyMeasureWithUnit.h brlcad/trunk/src/conv/step/UniformCurve.cpp brlcad/trunk/src/conv/step/UniformCurve.h brlcad/trunk/src/conv/step/UniformSurface.cpp brlcad/trunk/src/conv/step/UniformSurface.h brlcad/trunk/src/conv/step/Unit.cpp brlcad/trunk/src/conv/step/Unit.h brlcad/trunk/src/conv/step/Vector.cpp brlcad/trunk/src/conv/step/Vector.h brlcad/trunk/src/conv/step/Vertex.cpp brlcad/trunk/src/conv/step/Vertex.h brlcad/trunk/src/conv/step/VertexLoop.cpp brlcad/trunk/src/conv/step/VertexLoop.h brlcad/trunk/src/conv/step/VertexPoint.cpp brlcad/trunk/src/conv/step/VertexPoint.h brlcad/trunk/src/conv/step/VolumeContextDependentUnit.cpp brlcad/trunk/src/conv/step/VolumeContextDependentUnit.h brlcad/trunk/src/conv/step/VolumeConversionBasedUnit.cpp brlcad/trunk/src/conv/step/VolumeConversionBasedUnit.h brlcad/trunk/src/conv/step/VolumeSiUnit.cpp brlcad/trunk/src/conv/step/VolumeSiUnit.h brlcad/trunk/src/conv/step/VolumeUnit.cpp brlcad/trunk/src/conv/step/VolumeUnit.h Modified: brlcad/trunk/src/conv/step/QuasiUniformCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/QuasiUniformCurve.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/QuasiUniformCurve.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,9 +39,9 @@ id = 0; } -QuasiUniformCurve::QuasiUniformCurve(STEPWrapper *sw,int STEPid) { +QuasiUniformCurve::QuasiUniformCurve(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } QuasiUniformCurve::~QuasiUniformCurve() { @@ -54,7 +54,7 @@ // load base class attributes if ( !BSplineCurve::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BSplineCurve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BSplineCurve." << std::endl; return false; } @@ -63,10 +63,10 @@ void QuasiUniformCurve::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; BSplineCurve::Print(level+1); } STEPEntity * @@ -78,7 +78,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/QuasiUniformCurve.h =================================================================== --- brlcad/trunk/src/conv/step/QuasiUniformCurve.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/QuasiUniformCurve.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,7 +38,7 @@ public: QuasiUniformCurve(); virtual ~QuasiUniformCurve(); - QuasiUniformCurve(STEPWrapper *sw,int STEPid); + QuasiUniformCurve(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/QuasiUniformSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/QuasiUniformSurface.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/QuasiUniformSurface.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,9 +38,9 @@ id = 0; } -QuasiUniformSurface::QuasiUniformSurface(STEPWrapper *sw,int STEPid) { +QuasiUniformSurface::QuasiUniformSurface(STEPWrapper *sw,int step_id) { step=sw; - id = STEPid; + id = step_id; } QuasiUniformSurface::~QuasiUniformSurface() { @@ -53,7 +53,7 @@ id = sse->STEPfile_id; if (!BSplineSurface::Load(sw,sse)) { - cout << "Error loading QuasiUniformSurface." << endl; + std::cout << "Error loading QuasiUniformSurface." << std::endl; return false; } return true; @@ -61,10 +61,10 @@ void QuasiUniformSurface::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited:" << endl; + TAB(level); std::cout << "Inherited:" << std::endl; BSplineSurface::Print(level+1); } STEPEntity * @@ -76,7 +76,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/QuasiUniformSurface.h =================================================================== --- brlcad/trunk/src/conv/step/QuasiUniformSurface.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/QuasiUniformSurface.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,7 +38,7 @@ public: QuasiUniformSurface(); virtual ~QuasiUniformSurface(); - QuasiUniformSurface(STEPWrapper *sw,int STEPid); + QuasiUniformSurface(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RatioContextDependentUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/RatioContextDependentUnit.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RatioContextDependentUnit.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,9 +38,9 @@ id = 0; } -RatioContextDependentUnit::RatioContextDependentUnit(STEPWrapper *sw,int STEPid) { +RatioContextDependentUnit::RatioContextDependentUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RatioContextDependentUnit::~RatioContextDependentUnit() { @@ -54,11 +54,11 @@ // load base class attributes if ( !RatioUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ContextDependentUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -67,10 +67,10 @@ void RatioContextDependentUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; RatioUnit::Print(level+1); ContextDependentUnit::Print(level+1); @@ -84,7 +84,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RatioContextDependentUnit.h =================================================================== --- brlcad/trunk/src/conv/step/RatioContextDependentUnit.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RatioContextDependentUnit.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,7 +39,7 @@ public: RatioContextDependentUnit(); virtual ~RatioContextDependentUnit(); - RatioContextDependentUnit(STEPWrapper *sw,int STEPid); + RatioContextDependentUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RatioConversionBasedUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/RatioConversionBasedUnit.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RatioConversionBasedUnit.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -41,9 +41,9 @@ id = 0; } -RatioConversionBasedUnit::RatioConversionBasedUnit(STEPWrapper *sw,int STEPid) { +RatioConversionBasedUnit::RatioConversionBasedUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RatioConversionBasedUnit::~RatioConversionBasedUnit() { @@ -57,11 +57,11 @@ // load base class attributes if ( !RatioUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ConversionBasedUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -70,10 +70,10 @@ void RatioConversionBasedUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; RatioUnit::Print(level+1); ConversionBasedUnit::Print(level+1); @@ -87,7 +87,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RatioConversionBasedUnit.h =================================================================== --- brlcad/trunk/src/conv/step/RatioConversionBasedUnit.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RatioConversionBasedUnit.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,7 +39,7 @@ public: RatioConversionBasedUnit(); virtual ~RatioConversionBasedUnit(); - RatioConversionBasedUnit(STEPWrapper *sw,int STEPid); + RatioConversionBasedUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RatioSiUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/RatioSiUnit.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RatioSiUnit.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,9 +38,9 @@ id = 0; } -RatioSiUnit::RatioSiUnit(STEPWrapper *sw,int STEPid) { +RatioSiUnit::RatioSiUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RatioSiUnit::~RatioSiUnit() { @@ -54,11 +54,11 @@ // load base class attributes if ( !RatioUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !SiUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -67,10 +67,10 @@ void RatioSiUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; RatioUnit::Print(level+1); SiUnit::Print(level+1); @@ -84,7 +84,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RatioSiUnit.h =================================================================== --- brlcad/trunk/src/conv/step/RatioSiUnit.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RatioSiUnit.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,7 +39,7 @@ public: RatioSiUnit(); virtual ~RatioSiUnit(); - RatioSiUnit(STEPWrapper *sw,int STEPid); + RatioSiUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RatioUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/RatioUnit.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RatioUnit.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,9 +38,9 @@ id = 0; } -RatioUnit::RatioUnit(STEPWrapper *sw,int STEPid) { +RatioUnit::RatioUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RatioUnit::~RatioUnit() { @@ -54,7 +54,7 @@ // load base class attributes if ( !NamedUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -63,10 +63,10 @@ void RatioUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; NamedUnit::Print(level+1); } @@ -79,7 +79,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RatioUnit.h =================================================================== --- brlcad/trunk/src/conv/step/RatioUnit.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RatioUnit.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,7 +38,7 @@ public: RatioUnit(); virtual ~RatioUnit(); - RatioUnit(STEPWrapper *sw,int STEPid); + RatioUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RationalBSplineCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/RationalBSplineCurve.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBSplineCurve.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,9 +39,9 @@ id = 0; } -RationalBSplineCurve::RationalBSplineCurve(STEPWrapper *sw,int STEPid) { +RationalBSplineCurve::RationalBSplineCurve(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RationalBSplineCurve::~RationalBSplineCurve() { @@ -55,7 +55,7 @@ // load base class attributes if ( !BSplineCurve::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BSplineCurve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BSplineCurve." << std::endl; return false; } @@ -75,7 +75,7 @@ rn = (RealNode *)rn->NextNode(); } } else { - cout << CLASSNAME << ": Error loading RationalBSplineCurve(weights_data)." << endl; + std::cout << CLASSNAME << ": Error loading RationalBSplineCurve(weights_data)." << std::endl; return false; } } @@ -85,18 +85,18 @@ void RationalBSplineCurve::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; BSplineCurve::Print(level); - TAB(level); cout << "weights_data:"; + TAB(level); std::cout << "weights_data:"; LIST_OF_REALS::iterator i; for(i=weights_data.begin();i!=weights_data.end();i++) { - cout << " " << (*i); + std::cout << " " << (*i); } - cout << endl; + std::cout << std::endl; } STEPEntity * @@ -108,7 +108,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RationalBSplineCurve.h =================================================================== --- brlcad/trunk/src/conv/step/RationalBSplineCurve.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBSplineCurve.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -41,7 +41,7 @@ public: RationalBSplineCurve(); virtual ~RationalBSplineCurve(); - RationalBSplineCurve(STEPWrapper *sw,int STEPid); + RationalBSplineCurve(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RationalBSplineCurveWithKnots.cpp =================================================================== --- brlcad/trunk/src/conv/step/RationalBSplineCurveWithKnots.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBSplineCurveWithKnots.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,9 +38,9 @@ id = 0; } -RationalBSplineCurveWithKnots::RationalBSplineCurveWithKnots(STEPWrapper *sw,int STEPid) { +RationalBSplineCurveWithKnots::RationalBSplineCurveWithKnots(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RationalBSplineCurveWithKnots::~RationalBSplineCurveWithKnots() { @@ -53,11 +53,11 @@ // load base class attributes if ( !RationalBSplineCurve::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RationalBSplineCurve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RationalBSplineCurve." << std::endl; return false; } if ( !BSplineCurveWithKnots::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BSplineCurveWithKnots." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BSplineCurveWithKnots." << std::endl; return false; } @@ -66,9 +66,9 @@ void RationalBSplineCurveWithKnots::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; - cout << "ON_id:(" << ON_id << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; + std::cout << "ON_id:(" << ON_id << ")" << std::endl; RationalBSplineCurve::Print(level+1); BSplineCurveWithKnots::Print(level+1); @@ -83,7 +83,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RationalBSplineCurveWithKnots.h =================================================================== --- brlcad/trunk/src/conv/step/RationalBSplineCurveWithKnots.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBSplineCurveWithKnots.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,7 +39,7 @@ public: RationalBSplineCurveWithKnots(); virtual ~RationalBSplineCurveWithKnots(); - RationalBSplineCurveWithKnots(STEPWrapper *sw,int STEPid); + RationalBSplineCurveWithKnots(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RationalBSplineSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/RationalBSplineSurface.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBSplineSurface.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,9 +39,9 @@ id = 0; } -RationalBSplineSurface::RationalBSplineSurface(STEPWrapper *sw,int STEPid) { +RationalBSplineSurface::RationalBSplineSurface(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RationalBSplineSurface::~RationalBSplineSurface() { @@ -59,7 +59,7 @@ // load base class attributes if ( !BSplineSurface::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BSplineSurface." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BSplineSurface." << std::endl; return false; } @@ -93,7 +93,7 @@ } */ } else { - cout << CLASSNAME << ": Error loading RationalBSplineSurface(weights_data)." << endl; + std::cout << CLASSNAME << ": Error loading RationalBSplineSurface(weights_data)." << std::endl; return false; } } @@ -103,21 +103,21 @@ void RationalBSplineSurface::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; BSplineSurface::Print(level); - TAB(level); cout << "weights_data:" << endl; + TAB(level); std::cout << "weights_data:" << std::endl; LIST_OF_LIST_OF_REALS::iterator i; for(i=weights_data.begin();i!=weights_data.end();i++) { LIST_OF_REALS::iterator j; TAB(level); for(j=(*i)->begin();j!=(*i)->end();j++) { - cout << " " << (*j); + std::cout << " " << (*j); } - cout << endl; + std::cout << std::endl; } } STEPEntity * @@ -129,7 +129,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RationalBSplineSurface.h =================================================================== --- brlcad/trunk/src/conv/step/RationalBSplineSurface.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBSplineSurface.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -41,7 +41,7 @@ public: RationalBSplineSurface(); virtual ~RationalBSplineSurface(); - RationalBSplineSurface(STEPWrapper *sw,int STEPid); + RationalBSplineSurface(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RationalBSplineSurfaceWithKnots.cpp =================================================================== --- brlcad/trunk/src/conv/step/RationalBSplineSurfaceWithKnots.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBSplineSurfaceWithKnots.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,9 +38,9 @@ id = 0; } -RationalBSplineSurfaceWithKnots::RationalBSplineSurfaceWithKnots(STEPWrapper *sw,int STEPid) { +RationalBSplineSurfaceWithKnots::RationalBSplineSurfaceWithKnots(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RationalBSplineSurfaceWithKnots::~RationalBSplineSurfaceWithKnots() { @@ -53,11 +53,11 @@ // load base class attributes if ( !RationalBSplineSurface::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RationalBSplineSurface." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RationalBSplineSurface." << std::endl; return false; } if ( !BSplineSurfaceWithKnots::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BSplineSurfaceWithKnots." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BSplineSurfaceWithKnots." << std::endl; return false; } @@ -66,8 +66,8 @@ void RationalBSplineSurfaceWithKnots::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; RationalBSplineSurface::Print(level); BSplineSurfaceWithKnots::Print(level); @@ -81,7 +81,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RationalBSplineSurfaceWithKnots.h =================================================================== --- brlcad/trunk/src/conv/step/RationalBSplineSurfaceWithKnots.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBSplineSurfaceWithKnots.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,7 +39,7 @@ public: RationalBSplineSurfaceWithKnots(); virtual ~RationalBSplineSurfaceWithKnots(); - RationalBSplineSurfaceWithKnots(STEPWrapper *sw,int STEPid); + RationalBSplineSurfaceWithKnots(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RationalBezierCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/RationalBezierCurve.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBezierCurve.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,9 +38,9 @@ id = 0; } -RationalBezierCurve::RationalBezierCurve(STEPWrapper *sw,int STEPid) { +RationalBezierCurve::RationalBezierCurve(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RationalBezierCurve::~RationalBezierCurve() { @@ -53,7 +53,7 @@ // load base class attributes if ( !RationalBSplineCurve::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RationalBSplineCurve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RationalBSplineCurve." << std::endl; return false; } @@ -62,8 +62,8 @@ void RationalBezierCurve::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; RationalBSplineCurve::Print(level); @@ -77,7 +77,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RationalBezierCurve.h =================================================================== --- brlcad/trunk/src/conv/step/RationalBezierCurve.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBezierCurve.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,7 +39,7 @@ public: RationalBezierCurve(); virtual ~RationalBezierCurve(); - RationalBezierCurve(STEPWrapper *sw,int STEPid); + RationalBezierCurve(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RationalBezierSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/RationalBezierSurface.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBezierSurface.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,9 +38,9 @@ id = 0; } -RationalBezierSurface::RationalBezierSurface(STEPWrapper *sw,int STEPid) { +RationalBezierSurface::RationalBezierSurface(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RationalBezierSurface::~RationalBezierSurface() { @@ -53,7 +53,7 @@ // load base class attributes if ( !RationalBSplineSurface::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RationalBSplineSurface." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RationalBSplineSurface." << std::endl; return false; } @@ -62,8 +62,8 @@ void RationalBezierSurface::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; RationalBSplineSurface::Print(level); @@ -77,7 +77,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RationalBezierSurface.h =================================================================== --- brlcad/trunk/src/conv/step/RationalBezierSurface.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalBezierSurface.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -40,7 +40,7 @@ public: RationalBezierSurface(); virtual ~RationalBezierSurface(); - RationalBezierSurface(STEPWrapper *sw,int STEPid); + RationalBezierSurface(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RationalQuasiUniformCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/RationalQuasiUniformCurve.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalQuasiUniformCurve.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,9 +38,9 @@ id = 0; } -RationalQuasiUniformCurve::RationalQuasiUniformCurve(STEPWrapper *sw,int STEPid) { +RationalQuasiUniformCurve::RationalQuasiUniformCurve(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RationalQuasiUniformCurve::~RationalQuasiUniformCurve() { @@ -53,7 +53,7 @@ // load base class attributes (no need to add quasi here has no additional attributes) if ( !RationalBSplineCurve::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RationalBSplineCurve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RationalBSplineCurve." << std::endl; return false; } @@ -62,8 +62,8 @@ void RationalQuasiUniformCurve::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; RationalBSplineCurve::Print(level); } @@ -76,7 +76,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RationalQuasiUniformCurve.h =================================================================== --- brlcad/trunk/src/conv/step/RationalQuasiUniformCurve.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalQuasiUniformCurve.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,7 +39,7 @@ public: RationalQuasiUniformCurve(); virtual ~RationalQuasiUniformCurve(); - RationalQuasiUniformCurve(STEPWrapper *sw,int STEPid); + RationalQuasiUniformCurve(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RationalQuasiUniformSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/RationalQuasiUniformSurface.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalQuasiUniformSurface.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -38,9 +38,9 @@ id = 0; } -RationalQuasiUniformSurface::RationalQuasiUniformSurface(STEPWrapper *sw,int STEPid) { +RationalQuasiUniformSurface::RationalQuasiUniformSurface(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RationalQuasiUniformSurface::~RationalQuasiUniformSurface() { @@ -53,7 +53,7 @@ // load base class attributes (no need to add quasi here has no additional attributes) if ( !RationalBSplineSurface::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RationalBSplineSurface." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RationalBSplineSurface." << std::endl; return false; } @@ -62,8 +62,8 @@ void RationalQuasiUniformSurface::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; RationalBSplineSurface::Print(level); } @@ -76,7 +76,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RationalQuasiUniformSurface.h =================================================================== --- brlcad/trunk/src/conv/step/RationalQuasiUniformSurface.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalQuasiUniformSurface.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -40,7 +40,7 @@ public: RationalQuasiUniformSurface(); virtual ~RationalQuasiUniformSurface(); - RationalQuasiUniformSurface(STEPWrapper *sw,int STEPid); + RationalQuasiUniformSurface(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RationalUniformCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/RationalUniformCurve.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalUniformCurve.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,9 +39,9 @@ id = 0; } -RationalUniformCurve::RationalUniformCurve(STEPWrapper *sw,int STEPid) { +RationalUniformCurve::RationalUniformCurve(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RationalUniformCurve::~RationalUniformCurve() { @@ -54,7 +54,7 @@ // load base class attributes if ( !RationalBSplineCurve::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RationalBSplineCurve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RationalBSplineCurve." << std::endl; return false; } @@ -63,10 +63,10 @@ void RationalUniformCurve::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited:" << endl; + TAB(level); std::cout << "Inherited:" << std::endl; RationalBSplineCurve::Print(level+1); } STEPEntity * @@ -78,7 +78,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RationalUniformCurve.h =================================================================== --- brlcad/trunk/src/conv/step/RationalUniformCurve.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalUniformCurve.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,7 +39,7 @@ public: RationalUniformCurve(); virtual ~RationalUniformCurve(); - RationalUniformCurve(STEPWrapper *sw,int STEPid); + RationalUniformCurve(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RationalUniformSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/RationalUniformSurface.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalUniformSurface.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,9 +39,9 @@ id = 0; } -RationalUniformSurface::RationalUniformSurface(STEPWrapper *sw,int STEPid) { +RationalUniformSurface::RationalUniformSurface(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } RationalUniformSurface::~RationalUniformSurface() { @@ -54,7 +54,7 @@ // load base class attributes if ( !RationalBSplineSurface::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BSplineSurface." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BSplineSurface." << std::endl; return false; } // loading base class UniformSurface would add nothing here @@ -64,10 +64,10 @@ void RationalUniformSurface::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited:" << endl; + TAB(level); std::cout << "Inherited:" << std::endl; RationalBSplineSurface::Print(level+1); } STEPEntity * @@ -79,7 +79,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/RationalUniformSurface.h =================================================================== --- brlcad/trunk/src/conv/step/RationalUniformSurface.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RationalUniformSurface.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -40,7 +40,7 @@ public: RationalUniformSurface(); virtual ~RationalUniformSurface(); - RationalUniformSurface(STEPWrapper *sw,int STEPid); + RationalUniformSurface(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RectangularCompositeSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/RectangularCompositeSurface.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RectangularCompositeSurface.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -40,9 +40,9 @@ segments = NULL; } -RectangularCompositeSurface::RectangularCompositeSurface(STEPWrapper *sw,int STEPid) { +RectangularCompositeSurface::RectangularCompositeSurface(STEPWrapper *sw,int step_id) { step=sw; - id = STEPid; + id = step_id; segments = NULL; } @@ -65,7 +65,7 @@ id = sse->STEPfile_id; if ( !BoundedSurface::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BoundedSurface." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BoundedSurface." << std::endl; return false; } @@ -81,23 +81,23 @@ void RectangularCompositeSurface::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "segments:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "segments:" << std::endl; LIST_OF_LIST_OF_PATCHES::iterator i; int cnt=0; for(i=segments->begin(); i != segments->end(); ++i) { LIST_OF_PATCHES::iterator j; LIST_OF_PATCHES *p = *i; - TAB(level+1); cout << "surface_patch " << cnt++ << ":" << endl; + TAB(level+1); std::cout << "surface_patch " << cnt++ << ":" << std::endl; for(j=p->begin(); j != p->end(); ++j) { (*j)->Print(level+1); } } - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; BoundedSurface::Print(level+1); } @@ -110,7 +110,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -123,7 +123,7 @@ bool RectangularCompositeSurface::LoadONBrep(ON_Brep *brep) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } Modified: brlcad/trunk/src/conv/step/RectangularCompositeSurface.h =================================================================== --- brlcad/trunk/src/conv/step/RectangularCompositeSurface.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RectangularCompositeSurface.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -44,7 +44,7 @@ public: RectangularCompositeSurface(); virtual ~RectangularCompositeSurface(); - RectangularCompositeSurface(STEPWrapper *sw,int STEPid); + RectangularCompositeSurface(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/RectangularTrimmedSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/RectangularTrimmedSurface.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RectangularTrimmedSurface.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -39,9 +39,9 @@ basis_surface = NULL; } -RectangularTrimmedSurface::RectangularTrimmedSurface(STEPWrapper *sw,int STEPid) { +RectangularTrimmedSurface::RectangularTrimmedSurface(STEPWrapper *sw,int step_id) { step=sw; - id = STEPid; + id = step_id; basis_surface = NULL; } @@ -55,7 +55,7 @@ id = sse->STEPfile_id; if ( !BoundedSurface::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BoundedSurface." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BoundedSurface." << std::endl; return false; } @@ -68,7 +68,7 @@ if (entity) { basis_surface = dynamic_cast<Surface *>(Factory::CreateObject(sw,entity)); } else { - cerr << CLASSNAME << ": error loading 'basis_surface' attribute." << endl; + std::cerr << CLASSNAME << ": error loading 'basis_surface' attribute." << std::endl; return false; } } @@ -86,21 +86,21 @@ void RectangularTrimmedSurface::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; basis_surface->Print(level+1); - TAB(level+1); cout << "u1:" << u1 << endl; - TAB(level+1); cout << "u2:" << u2 << endl; - TAB(level+1); cout << "v1:" << u1 << endl; - TAB(level+1); cout << "v2:" << u2 << endl; + TAB(level+1); std::cout << "u1:" << u1 << std::endl; + TAB(level+1); std::cout << "u2:" << u2 << std::endl; + TAB(level+1); std::cout << "v1:" << u1 << std::endl; + TAB(level+1); std::cout << "v2:" << u2 << std::endl; - TAB(level+1); cout << "usense:" << step->getBooleanString((SCLBOOL_H(Boolean))usense) << endl; - TAB(level+1); cout << "vsense:" << step->getBooleanString((SCLBOOL_H(Boolean))vsense) << endl; + TAB(level+1); std::cout << "usense:" << step->getBooleanString((SCLBOOL_H(Boolean))usense) << std::endl; + TAB(level+1); std::cout << "vsense:" << step->getBooleanString((SCLBOOL_H(Boolean))vsense) << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; BoundedSurface::Print(level+1); } @@ -113,7 +113,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -126,7 +126,7 @@ bool RectangularTrimmedSurface::LoadONBrep(ON_Brep *brep) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } Modified: brlcad/trunk/src/conv/step/RectangularTrimmedSurface.h =================================================================== --- brlcad/trunk/src/conv/step/RectangularTrimmedSurface.h 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/RectangularTrimmedSurface.h 2009-12-29 12:35:59 UTC (rev 37060) @@ -53,7 +53,7 @@ public: RectangularTrimmedSurface(); virtual ~RectangularTrimmedSurface(); - RectangularTrimmedSurface(STEPWrapper *sw,int STEPid); + RectangularTrimmedSurface(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/Representation.cpp =================================================================== --- brlcad/trunk/src/conv/step/Representation.cpp 2009-12-29 12:31:35 UTC (rev 37059) +++ brlcad/trunk/src/conv/step/Representation.cpp 2009-12-29 12:35:59 UTC (rev 37060) @@ -42,267 +42,267 @@ #define CLASSNAME "Representation" #define ENTITYNAME "Representation" -string Representation::entityname = Factory::RegisterClass(ENTITYNAME, (FactoryMethod)Representation::Create); +string Representation::entityname = Factory::RegisterClass(ENTITYNAME,(FactoryMethod)Representation::Create); Representation::Representation() { - step = NULL; - id = 0; + step = NULL; + id = 0; } -Representation::Representation(STEPWrapper *sw, int STEPid) { - step = sw; - id = STEPid; +Representation::Representation(STEPWrapper *sw,int step_id) { + step = sw; + id = step_id; } Representation::~Representation() { - /* - LIST_OF_REPRESENTATION_ITEMS::iterator i = items.begin(); + /* + LIST_OF_REPRESENTATION_ITEMS::iterator i = items.begin(); - while (i != items.end()) { - delete (*i); - i = items.erase(i); - } + while(i != items.end()) { + delete (*i); + i = items.erase(i); + } - LIST_OF_REPRESENTATION_CONTEXT::iterator ic = context_of_items.begin(); - - while (ic != context_of_items.end()) { - delete (*ic); - ic = context_of_items.erase(ic); - } - */ - items.clear(); - if (context_of_items.size() > 1) { LIST_OF_REPRESENTATION_CONTEXT::iterator ic = context_of_items.begin(); - while (ic != context_of_items.end()) { - delete (*ic); - ic = context_of_items.erase(ic); + while(ic != context_of_items.end()) { + delete (*ic); + ic = context_of_items.erase(ic); } - } else { - context_of_items.clear(); - } + */ + items.clear(); + if (context_of_items.size() > 1) { + LIST_OF_REPRESENTATION_CONTEXT::iterator ic = context_of_items.begin(); + + while(ic != context_of_items.end()) { + delete (*ic); + ic = context_of_items.erase(ic); + } + } else { + context_of_items.clear(); + } } double Representation::GetLengthConversionFactor() { - LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); + LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); - while (i != context_of_items.end()) { - GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); - if (aGUAC != NULL) { - return aGUAC->GetLengthConversionFactor(); + while (i != context_of_items.end()) { + GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); + if (aGUAC != NULL) { + return aGUAC->GetLengthConversionFactor(); + } + i++; } - i++; - } - return 1000.0; // assume base of meters + return 1000.0; // assume base of meters } double Representation::GetPlaneAngleConversionFactor() { - LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); + LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); - while (i != context_of_items.end()) { - GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); - if (aGUAC != NULL) { - return aGUAC->GetPlaneAngleConversionFactor(); + while (i != context_of_items.end()) { + GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); + if (aGUAC != NULL) { + return aGUAC->GetPlaneAngleConversionFactor(); + } + i++; } - i++; - } - return 1.0; // assume base of radians + return 1.0; // assume base of radians } double Representation::GetSolidAngleConversionFactor() { - LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); + LIST_OF_REPRESENTATION_CONTEXT::iterator i = context_of_items.begin(); - while (i != context_of_items.end()) { - GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); - if (aGUAC != NULL) { - return aGUAC->GetSolidAngleConversionFactor(); + while (i != context_of_items.end()) { + GlobalUnitAssignedContext *aGUAC = dynamic_cast<GlobalUnitAssignedContext *>(*i); + if (aGUAC != NULL) { + return aGUAC->GetSolidAngleConversionFactor(); + } + i++; } - i++; - } - return 1.0; // assume base of steradians + return 1.0; // assume base of steradians } bool Representation::Load(STEPWrapper *sw, SCLP23(Application_instance) *sse) { - step=sw; - id = sse->STEPfile_id; + step=sw; + id = sse->STEPfile_id; - // need to do this for local attributes to makes sure we have - // the actual entity and not a complex/supertype parent - sse = step->getEntity(sse, ENTITYNAME); + // need to do this for local attributes to makes sure we have + // the actual entity and not a complex/supertype parent + sse = step->getEntity(sse,ENTITYNAME); - name = step->getStringAttribute(sse, "name"); + name = step->getStringAttribute(sse,"name"); - if (items.empty()) { - LIST_OF_ENTITIES *l = step->getListOfEntities(sse, "items"); - LIST_OF_ENTITIES::iterator i; - for (i=l->begin();i!=l->end();i++) { - SCLP23(Application_instance) *entity = (*i); - if (entity) { - RepresentationItem *aRI = dynamic_cast<RepresentationItem *>(Factory::CreateObject(sw, entity)); - items.push_back(aRI); - } else { + if (items.empty()) { + LIST_OF_ENTITIES *l = step->getListOfEntities(sse,"items"); + LIST_OF_ENTITIES::iterator i; + for(i=l->begin();i!=l->end();i++) { + SCLP23(Application_instance) *entity = (*i); + if (entity) { + RepresentationItem *aRI = dynamic_cast<RepresentationItem *>(Factory::CreateObject(sw,entity)); + items.push_back(aRI); + } else { std::cerr << CLASSNAME << ": Unhandled entity in attribute 'items'." << std::endl;; - return false; - } + return false; + } + } + l->clear(); + delete l; } - l->clear(); - delete l; - } - if (context_of_items.empty()) { - SCLP23(Application_instance) *entity = step->getEntityAttribute(sse, "context_of_items"); - if (entity->IsComplex()) { - SCLP23(Application_instance) *sub_entity = step->getEntity(entity, "Geometric_Representation_Context"); - if (sub_entity) { - GeometricRepresentationContext *aGRC = new GeometricRepresentationContext(); + if (context_of_items.empty()) { + SCLP23(Application_instance) *entity = step->getEntityAttribute(sse,"context_of_items"); + if (entity->IsComplex()) { + SCLP23(Application_instance) *sub_entity = step->getEntity(entity,"Geometric_Representation_Context"); + if (sub_entity) { + GeometricRepresentationContext *aGRC = new GeometricRepresentationContext(); - context_of_items.push_back(aGRC); - if (!aGRC->Load(step, sub_entity)) { + context_of_items.push_back(aGRC); + if (!aGRC->Load(step,sub_entity)) { std::cout << CLASSNAME << ":Error loading GeometricRepresentationContext" << std::endl;; - return false; - } - } + return false; + } + } - sub_entity = step->getEntity(entity, "Global_Uncertainty_Assigned_Context"); - if (sub_entity) { - GlobalUncertaintyAssignedContext *aGUAC = new GlobalUncertaintyAssignedContext(); + sub_entity = step->getEntity(entity,"Global_Uncertainty_Assigned_Context"); + if (sub_entity) { + GlobalUncertaintyAssignedContext *aGUAC = new GlobalUncertaintyAssignedContext(); - context_of_items.push_back(aGUAC); - if (!aGUAC->Load(step, sub_entity)) { + context_of_items.push_back(aGUAC); + if (!aGUAC->Load(step,sub_entity)) { std::cout << CLASSNAME << ":Error loading GlobalUncertaintyAssignedContext" << std::endl;; - return false; - } - } + return false; + } + } - sub_entity = step->getEntity(entity, "Global_Unit_Assigned_Context"); - if (sub_entity) { - GlobalUnitAssignedContext *aGUAC = new GlobalUnitAssignedContext(); + sub_entity = step->getEntity(entity,"Global_Unit_Assigned_Context"); + if (sub_entity) { + GlobalUnitAssignedContext *aGUAC = new GlobalU... [truncated message content] |
From: <ind...@us...> - 2009-12-29 13:30:14
|
Revision: 37059 http://brlcad.svn.sourceforge.net/brlcad/?rev=37059&view=rev Author: indianlarry Date: 2009-12-29 12:31:35 +0000 (Tue, 29 Dec 2009) Log Message: ----------- Start of updates to cleanup compile warnings including cleaned up of some variable shadowing, namespace path additions to standard IO items, cleaned up of some CPP defs in the STEP generated code(will need to address in 'fedex') Modified Paths: -------------- brlcad/trunk/src/conv/step/ManifoldSolidBrep.cpp brlcad/trunk/src/conv/step/ManifoldSolidBrep.h brlcad/trunk/src/conv/step/MassContextDependentUnit.cpp brlcad/trunk/src/conv/step/MassContextDependentUnit.h brlcad/trunk/src/conv/step/MassConversionBasedUnit.cpp brlcad/trunk/src/conv/step/MassConversionBasedUnit.h brlcad/trunk/src/conv/step/MassSiUnit.cpp brlcad/trunk/src/conv/step/MassSiUnit.h brlcad/trunk/src/conv/step/MassUnit.cpp brlcad/trunk/src/conv/step/MassUnit.h brlcad/trunk/src/conv/step/MeasureValue.cpp brlcad/trunk/src/conv/step/MeasureValue.h brlcad/trunk/src/conv/step/MeasureWithUnit.cpp brlcad/trunk/src/conv/step/MeasureWithUnit.h brlcad/trunk/src/conv/step/NamedUnit.cpp brlcad/trunk/src/conv/step/NamedUnit.h brlcad/trunk/src/conv/step/OffsetCurve2D.cpp brlcad/trunk/src/conv/step/OffsetCurve2D.h brlcad/trunk/src/conv/step/OffsetCurve3D.cpp brlcad/trunk/src/conv/step/OffsetCurve3D.h brlcad/trunk/src/conv/step/OffsetSurface.cpp brlcad/trunk/src/conv/step/OffsetSurface.h brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp brlcad/trunk/src/conv/step/OrientedEdge.cpp brlcad/trunk/src/conv/step/OrientedEdge.h brlcad/trunk/src/conv/step/PCurve.cpp brlcad/trunk/src/conv/step/PCurve.h brlcad/trunk/src/conv/step/PCurveOrSurface.cpp brlcad/trunk/src/conv/step/PCurveOrSurface.h brlcad/trunk/src/conv/step/Parabola.cpp brlcad/trunk/src/conv/step/Parabola.h brlcad/trunk/src/conv/step/ParametricRepresentationContext.cpp brlcad/trunk/src/conv/step/ParametricRepresentationContext.h brlcad/trunk/src/conv/step/Path.cpp brlcad/trunk/src/conv/step/Path.h brlcad/trunk/src/conv/step/Placement.cpp brlcad/trunk/src/conv/step/Placement.h brlcad/trunk/src/conv/step/Plane.cpp brlcad/trunk/src/conv/step/Plane.h brlcad/trunk/src/conv/step/PlaneAngleContextDependentUnit.cpp brlcad/trunk/src/conv/step/PlaneAngleContextDependentUnit.h brlcad/trunk/src/conv/step/PlaneAngleConversionBasedUnit.cpp brlcad/trunk/src/conv/step/PlaneAngleConversionBasedUnit.h brlcad/trunk/src/conv/step/PlaneAngleMeasureWithUnit.cpp brlcad/trunk/src/conv/step/PlaneAngleMeasureWithUnit.h brlcad/trunk/src/conv/step/PlaneAngleSiUnit.cpp brlcad/trunk/src/conv/step/PlaneAngleSiUnit.h brlcad/trunk/src/conv/step/PlaneAngleUnit.cpp brlcad/trunk/src/conv/step/PlaneAngleUnit.h brlcad/trunk/src/conv/step/Point.cpp brlcad/trunk/src/conv/step/Point.h brlcad/trunk/src/conv/step/Polyline.cpp brlcad/trunk/src/conv/step/Polyline.h brlcad/trunk/src/conv/step/PullbackCurve.cpp brlcad/trunk/src/conv/step/PullbackCurve.h Modified: brlcad/trunk/src/conv/step/ManifoldSolidBrep.cpp =================================================================== --- brlcad/trunk/src/conv/step/ManifoldSolidBrep.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/ManifoldSolidBrep.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -40,9 +40,9 @@ outer = NULL; } -ManifoldSolidBrep::ManifoldSolidBrep(STEPWrapper *sw,int STEPid) { +ManifoldSolidBrep::ManifoldSolidBrep(STEPWrapper *sw,int step_id) { step=sw; - id = STEPid; + id = step_id; outer = NULL; } @@ -57,7 +57,7 @@ // load base class attributes if ( !SolidModel::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::SolidModel." << endl; + std::cout << CLASSNAME << ":Error loading base class ::SolidModel." << std::endl; return false; } @@ -71,7 +71,7 @@ //outer = dynamic_cast<ClosedShell *>(Factory::CreateTopologicalObject(sw,entity)); outer = dynamic_cast<ClosedShell *>(Factory::CreateObject(sw,entity)); } else { - cout << CLASSNAME << ":Error loading entity attribute 'outer'." << endl; + std::cout << CLASSNAME << ":Error loading entity attribute 'outer'." << std::endl; return false; } } @@ -80,14 +80,14 @@ void ManifoldSolidBrep::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "outer:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "outer:" << std::endl; outer->Print(level+1); - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; SolidModel::Print(level+1); } @@ -100,7 +100,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -114,7 +114,7 @@ ManifoldSolidBrep::LoadONBrep(ON_Brep *brep) { if ( !outer->LoadONBrep(brep) ) { - cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << endl; + std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } return true; Modified: brlcad/trunk/src/conv/step/ManifoldSolidBrep.h =================================================================== --- brlcad/trunk/src/conv/step/ManifoldSolidBrep.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/ManifoldSolidBrep.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -43,7 +43,7 @@ public: ManifoldSolidBrep(); - ManifoldSolidBrep(STEPWrapper *sw,int STEPid); + ManifoldSolidBrep(STEPWrapper *sw,int step_id); virtual ~ManifoldSolidBrep(); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); Modified: brlcad/trunk/src/conv/step/MassContextDependentUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/MassContextDependentUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MassContextDependentUnit.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -38,9 +38,9 @@ id = 0; } -MassContextDependentUnit::MassContextDependentUnit(STEPWrapper *sw,int STEPid) { +MassContextDependentUnit::MassContextDependentUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } MassContextDependentUnit::~MassContextDependentUnit() { @@ -54,11 +54,11 @@ // load base class attributes if ( !MassUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ContextDependentUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -67,10 +67,10 @@ void MassContextDependentUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; MassUnit::Print(level+1); ContextDependentUnit::Print(level+1); @@ -84,7 +84,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/MassContextDependentUnit.h =================================================================== --- brlcad/trunk/src/conv/step/MassContextDependentUnit.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MassContextDependentUnit.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -39,7 +39,7 @@ public: MassContextDependentUnit(); virtual ~MassContextDependentUnit(); - MassContextDependentUnit(STEPWrapper *sw,int STEPid); + MassContextDependentUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/MassConversionBasedUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/MassConversionBasedUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MassConversionBasedUnit.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -41,9 +41,9 @@ id = 0; } -MassConversionBasedUnit::MassConversionBasedUnit(STEPWrapper *sw,int STEPid) { +MassConversionBasedUnit::MassConversionBasedUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } MassConversionBasedUnit::~MassConversionBasedUnit() { @@ -57,11 +57,11 @@ // load base class attributes if ( !MassUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !ConversionBasedUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -70,10 +70,10 @@ void MassConversionBasedUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; MassUnit::Print(level+1); ConversionBasedUnit::Print(level+1); @@ -87,7 +87,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/MassConversionBasedUnit.h =================================================================== --- brlcad/trunk/src/conv/step/MassConversionBasedUnit.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MassConversionBasedUnit.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -39,7 +39,7 @@ public: MassConversionBasedUnit(); virtual ~MassConversionBasedUnit(); - MassConversionBasedUnit(STEPWrapper *sw,int STEPid); + MassConversionBasedUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/MassSiUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/MassSiUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MassSiUnit.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -38,9 +38,9 @@ id = 0; } -MassSiUnit::MassSiUnit(STEPWrapper *sw,int STEPid) { +MassSiUnit::MassSiUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } MassSiUnit::~MassSiUnit() { @@ -54,11 +54,11 @@ // load base class attributes if ( !MassUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } if ( !SiUnit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -67,10 +67,10 @@ void MassSiUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; MassUnit::Print(level+1); SiUnit::Print(level+1); @@ -84,7 +84,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/MassSiUnit.h =================================================================== --- brlcad/trunk/src/conv/step/MassSiUnit.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MassSiUnit.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -39,7 +39,7 @@ public: MassSiUnit(); virtual ~MassSiUnit(); - MassSiUnit(STEPWrapper *sw,int STEPid); + MassSiUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/MassUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/MassUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MassUnit.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -38,9 +38,9 @@ id = 0; } -MassUnit::MassUnit(STEPWrapper *sw,int STEPid) { +MassUnit::MassUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } MassUnit::~MassUnit() { @@ -63,10 +63,10 @@ void MassUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; NamedUnit::Print(level+1); } @@ -79,7 +79,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/MassUnit.h =================================================================== --- brlcad/trunk/src/conv/step/MassUnit.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MassUnit.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -38,7 +38,7 @@ public: MassUnit(); virtual ~MassUnit(); - MassUnit(STEPWrapper *sw,int STEPid); + MassUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/MeasureValue.cpp =================================================================== --- brlcad/trunk/src/conv/step/MeasureValue.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MeasureValue.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -63,9 +63,9 @@ id = 0; } -MeasureValue::MeasureValue(STEPWrapper *sw,int STEPid) { +MeasureValue::MeasureValue(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } MeasureValue::~MeasureValue() { @@ -74,7 +74,7 @@ double MeasureValue::GetLengthMeasure() { if (type != LENGTH_MEASURE) { - cerr << CLASSNAME << ":Error: Not a length measure." << endl; + std::cerr << CLASSNAME << ":Error: Not a length measure." << std::endl; return 1.0; } return rvalue; @@ -83,7 +83,7 @@ double MeasureValue::GetPlaneAngleMeasure() { if (type != PLANE_ANGLE_MEASURE) { - cerr << CLASSNAME << ":Error: Not a plane angle measure." << endl; + std::cerr << CLASSNAME << ":Error: Not a plane angle measure." << std::endl; return 1.0; } return rvalue; @@ -92,7 +92,7 @@ double MeasureValue::GetSolidAngleMeasure() { if (type != SOLID_ANGLE_MEASURE) { - cerr << CLASSNAME << ":Error: Not a solid angle measure." << endl; + std::cerr << CLASSNAME << ":Error: Not a solid angle measure." << std::endl; return 1.0; } return rvalue; @@ -103,7 +103,7 @@ step=sw; // id = sse->STEPfile_id; - //cout << sse->UnderlyingTypeName() << endl; + //std::cout << sse->UnderlyingTypeName() << std::endl; SdaiMeasure_value *v = (SdaiMeasure_value *)sse; if ( v->IsLength_measure()) { @@ -179,16 +179,16 @@ void MeasureValue::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; if (type == DESCRIPTIVE_MEASURE) { - TAB(level+1); cout << "Type:" << measure_type_names[type] << " Value:" << svalue << endl; + TAB(level+1); std::cout << "Type:" << measure_type_names[type] << " Value:" << svalue << std::endl; } else if ((type == COUNT_MEASURE) || (type == NUMERIC_MEASURE)) { - TAB(level+1); cout << "Type:" << measure_type_names[type] << " Value:" << ivalue << endl; + TAB(level+1); std::cout << "Type:" << measure_type_names[type] << " Value:" << ivalue << std::endl; } else { - TAB(level+1); cout << "Type:" << measure_type_names[type] << " Value:" << rvalue << endl; + TAB(level+1); std::cout << "Type:" << measure_type_names[type] << " Value:" << rvalue << std::endl; } } STEPEntity * @@ -200,7 +200,7 @@ Factory::AddObject(object); if (!object->Load(sw, (SCLP23(Select) *)sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/MeasureValue.h =================================================================== --- brlcad/trunk/src/conv/step/MeasureValue.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MeasureValue.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -66,7 +66,7 @@ public: MeasureValue(); virtual ~MeasureValue(); - MeasureValue(STEPWrapper *sw,int STEPid); + MeasureValue(STEPWrapper *sw,int step_id); double GetLengthMeasure(); double GetPlaneAngleMeasure(); double GetSolidAngleMeasure(); Modified: brlcad/trunk/src/conv/step/MeasureWithUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/MeasureWithUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MeasureWithUnit.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -43,9 +43,9 @@ unit_component = NULL; } -MeasureWithUnit::MeasureWithUnit(STEPWrapper *sw,int STEPid) { +MeasureWithUnit::MeasureWithUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; unit_component = NULL; } @@ -107,7 +107,7 @@ SCLP23(Select) *select = step->getSelectAttribute(sse,"value_component"); if (select) { if (!value_component.Load(step,select)) { - cout << CLASSNAME << ":Error loading MeasureValue." << endl; + std::cout << CLASSNAME << ":Error loading MeasureValue." << std::endl; return false; } } else { @@ -128,7 +128,7 @@ unit_component = (Unit*)Factory::CreateObject(sw,(SCLP23(Application_instance) *)du); #endif } else { - cerr << CLASSNAME << ": Unknown 'Unit' type from select." << endl; + std::cerr << CLASSNAME << ": Unknown 'Unit' type from select." << std::endl; return false; } } else { @@ -140,14 +140,14 @@ void MeasureWithUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "value_component:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "value_component:" << std::endl; value_component.Print(level+1); - TAB(level+1); cout << "unit_component:" << endl; + TAB(level+1); std::cout << "unit_component:" << std::endl; unit_component->Print(level+1); } @@ -160,7 +160,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/MeasureWithUnit.h =================================================================== --- brlcad/trunk/src/conv/step/MeasureWithUnit.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/MeasureWithUnit.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -43,7 +43,7 @@ public: MeasureWithUnit(); virtual ~MeasureWithUnit(); - MeasureWithUnit(STEPWrapper *sw,int STEPid); + MeasureWithUnit(STEPWrapper *sw,int step_id); double GetLengthConversionFactor(); double GetPlaneAngleConversionFactor(); double GetSolidAngleConversionFactor(); Modified: brlcad/trunk/src/conv/step/NamedUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/NamedUnit.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/NamedUnit.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -41,9 +41,9 @@ } -NamedUnit::NamedUnit(STEPWrapper *sw,int STEPid) { +NamedUnit::NamedUnit(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; dimensions = NULL; } @@ -61,7 +61,7 @@ // load base class attributes if ( !Unit::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Unit." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Unit." << std::endl; return false; } @@ -85,14 +85,14 @@ void NamedUnit::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Local Attributes:" << endl; - TAB(level+1); cout << "dimensions:" << endl; + TAB(level); std::cout << "Local Attributes:" << std::endl; + TAB(level+1); std::cout << "dimensions:" << std::endl; dimensions->Print(level+1); - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; Unit::Print(level+1); } @@ -105,7 +105,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/NamedUnit.h =================================================================== --- brlcad/trunk/src/conv/step/NamedUnit.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/NamedUnit.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -41,7 +41,7 @@ public: NamedUnit(); virtual ~NamedUnit(); - NamedUnit(STEPWrapper *sw,int STEPid); + NamedUnit(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/OffsetCurve2D.cpp =================================================================== --- brlcad/trunk/src/conv/step/OffsetCurve2D.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/OffsetCurve2D.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -41,9 +41,9 @@ id = 0; } -OffsetCurve2D::OffsetCurve2D(STEPWrapper *sw,int STEPid) { +OffsetCurve2D::OffsetCurve2D(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } OffsetCurve2D::~OffsetCurve2D() { @@ -56,7 +56,7 @@ id = sse->STEPfile_id; if ( !Curve::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Curve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Curve." << std::endl; return false; } @@ -69,7 +69,7 @@ if (entity) { basis_curve = dynamic_cast<Curve *>(Factory::CreateObject(sw,entity)); //CreateCurveObject(sw,entity)); } else { - cerr << CLASSNAME << ": Error loading entity attribute 'basis_curve'." << endl; + std::cerr << CLASSNAME << ": Error loading entity attribute 'basis_curve'." << std::endl; return false; } } @@ -82,25 +82,25 @@ const double * OffsetCurve2D::PointAtEnd() { - cerr << CLASSNAME << ": Error: virtual function PointAtEnd() not implemented for this type of curve."; + std::cerr << CLASSNAME << ": Error: virtual function PointAtEnd() not implemented for this type of curve."; return NULL; } const double * OffsetCurve2D::PointAtStart() { - cerr << CLASSNAME << ": Error: virtual function PointAtStart() not implemented for this type of curve."; + std::cerr << CLASSNAME << ": Error: virtual function PointAtStart() not implemented for this type of curve."; return NULL; } void OffsetCurve2D::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; basis_curve->Print(level+1); - TAB(level+1); cout << "distance:" << distance << endl; - TAB(level+1); cout << "self_intersect:" << step->getLogicalString(self_intersect) << endl; + TAB(level+1); std::cout << "distance:" << distance << std::endl; + TAB(level+1); std::cout << "self_intersect:" << step->getLogicalString(self_intersect) << std::endl; } STEPEntity * OffsetCurve2D::Create(STEPWrapper *sw,SCLP23(Application_instance) *sse){ @@ -111,7 +111,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/OffsetCurve2D.h =================================================================== --- brlcad/trunk/src/conv/step/OffsetCurve2D.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/OffsetCurve2D.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -43,7 +43,7 @@ public: OffsetCurve2D(); virtual ~OffsetCurve2D(); - OffsetCurve2D(STEPWrapper *sw,int STEPid); + OffsetCurve2D(STEPWrapper *sw,int step_id); virtual curve_type CurveType() { return OFFSET_CURVE_2D; }; bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual const double *PointAtEnd(); Modified: brlcad/trunk/src/conv/step/OffsetCurve3D.cpp =================================================================== --- brlcad/trunk/src/conv/step/OffsetCurve3D.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/OffsetCurve3D.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -41,9 +41,9 @@ id = 0; } -OffsetCurve3D::OffsetCurve3D(STEPWrapper *sw,int STEPid) { +OffsetCurve3D::OffsetCurve3D(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } OffsetCurve3D::~OffsetCurve3D() { @@ -57,7 +57,7 @@ id = sse->STEPfile_id; if ( !Curve::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Curve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Curve." << std::endl; return false; } @@ -70,7 +70,7 @@ if (entity) { basis_curve = dynamic_cast<Curve *>(Factory::CreateObject(sw,entity)); //CreateCurveObject(sw,entity)); } else { - cerr << CLASSNAME << ": Error loading entity attribute 'basis_curve'." << endl; + std::cerr << CLASSNAME << ": Error loading entity attribute 'basis_curve'." << std::endl; return false; } } @@ -83,7 +83,7 @@ if (entity) { ref_direction = dynamic_cast<Direction *>(Factory::CreateObject(sw,entity)); } else { - cerr << CLASSNAME << ": Error loading entity attribute 'ref_direction'." << endl; + std::cerr << CLASSNAME << ": Error loading entity attribute 'ref_direction'." << std::endl; return false; } } @@ -93,25 +93,25 @@ const double * OffsetCurve3D::PointAtEnd() { - cerr << CLASSNAME << ": Error: virtual function PointAtEnd() not implemented for this type of curve."; + std::cerr << CLASSNAME << ": Error: virtual function PointAtEnd() not implemented for this type of curve."; return NULL; } const double * OffsetCurve3D::PointAtStart() { - cerr << CLASSNAME << ": Error: virtual function PointAtStart() not implemented for this type of curve."; + std::cerr << CLASSNAME << ": Error: virtual function PointAtStart() not implemented for this type of curve."; return NULL; } void OffsetCurve3D::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; basis_curve->Print(level+1); - TAB(level+1); cout << "distance:" << distance << endl; - TAB(level+1); cout << "self_intersect:" << step->getLogicalString(self_intersect) << endl; + TAB(level+1); std::cout << "distance:" << distance << std::endl; + TAB(level+1); std::cout << "self_intersect:" << step->getLogicalString(self_intersect) << std::endl; ref_direction->Print(level+1); } STEPEntity * @@ -123,7 +123,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/OffsetCurve3D.h =================================================================== --- brlcad/trunk/src/conv/step/OffsetCurve3D.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/OffsetCurve3D.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -46,7 +46,7 @@ public: OffsetCurve3D(); virtual ~OffsetCurve3D(); - OffsetCurve3D(STEPWrapper *sw,int STEPid); + OffsetCurve3D(STEPWrapper *sw,int step_id); virtual curve_type CurveType() { return OFFSET_CURVE_3D; }; bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual const double *PointAtEnd(); Modified: brlcad/trunk/src/conv/step/OffsetSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/OffsetSurface.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/OffsetSurface.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -39,9 +39,9 @@ basis_surface = NULL; } -OffsetSurface::OffsetSurface(STEPWrapper *sw,int STEPid) { +OffsetSurface::OffsetSurface(STEPWrapper *sw,int step_id) { step=sw; - id = STEPid; + id = step_id; basis_surface = NULL; } @@ -55,7 +55,7 @@ id = sse->STEPfile_id; if ( !Surface::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::BoundedSurface." << endl; + std::cout << CLASSNAME << ":Error loading base class ::BoundedSurface." << std::endl; return false; } @@ -68,7 +68,7 @@ if (entity) { basis_surface = dynamic_cast<Surface *>(Factory::CreateObject(sw,entity)); } else { - cerr << CLASSNAME << ": error loading 'basis_surface' attribute." << endl; + std::cerr << CLASSNAME << ": error loading 'basis_surface' attribute." << std::endl; return false; } } @@ -81,16 +81,16 @@ void OffsetSurface::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; basis_surface->Print(level+1); - TAB(level+1); cout << "distance:" << distance << endl; - TAB(level+1); cout << "self_intersect:" << step->getLogicalString((SCLLOG_H(Logical))self_intersect) << endl; + TAB(level+1); std::cout << "distance:" << distance << std::endl; + TAB(level+1); std::cout << "self_intersect:" << step->getLogicalString((SCLLOG_H(Logical))self_intersect) << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; Surface::Print(level+1); } @@ -103,7 +103,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } @@ -116,7 +116,7 @@ bool OffsetSurface::LoadONBrep(ON_Brep *brep) { - cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } Modified: brlcad/trunk/src/conv/step/OffsetSurface.h =================================================================== --- brlcad/trunk/src/conv/step/OffsetSurface.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/OffsetSurface.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -45,7 +45,7 @@ public: OffsetSurface(); virtual ~OffsetSurface(); - OffsetSurface(STEPWrapper *sw,int STEPid); + OffsetSurface(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp =================================================================== --- brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -133,7 +133,7 @@ bool BezierCurve::LoadONBrep(ON_Brep *brep) { - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << " id: " << id << std::endl; return false; } @@ -166,10 +166,10 @@ } LIST_OF_POINTS::iterator i; - int t = 0; + int cv_index = 0; for (i = control_points_list.begin(); i != control_points_list.end(); ++i) { - curve->SetCV(t, ON_3dPoint((*i)->X() * LocalUnits::length, (*i)->Y() * LocalUnits::length, (*i)->Z() * LocalUnits::length)); - t++; + curve->SetCV(cv_index, ON_3dPoint((*i)->X() * LocalUnits::length, (*i)->Y() * LocalUnits::length, (*i)->Z() * LocalUnits::length)); + cv_index++; } ON_id = brep->AddEdgeCurve(curve); @@ -235,10 +235,10 @@ } } LIST_OF_POINTS::iterator i; - int t = 0; + int cv_index = 0; for (i = control_points_list.begin(); i != control_points_list.end(); ++i) { - curve->SetCV(t, ON_3dPoint((*i)->X() * LocalUnits::length, (*i)->Y() * LocalUnits::length, (*i)->Z() * LocalUnits::length)); - t++; + curve->SetCV(cv_index, ON_3dPoint((*i)->X() * LocalUnits::length, (*i)->Y() * LocalUnits::length, (*i)->Z() * LocalUnits::length)); + cv_index++; } ON_id = brep->AddEdgeCurve(curve); @@ -254,7 +254,7 @@ return true; if (!BSplineCurve::LoadONBrep(brep)) { - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << " id: " << id << std::endl; return false; } return true; @@ -264,7 +264,7 @@ bool RationalBezierCurve::LoadONBrep(ON_Brep *brep) { - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << " id: " << id << std::endl; return false; } @@ -298,11 +298,11 @@ LIST_OF_POINTS::iterator i; LIST_OF_REALS::iterator r = weights_data.begin(); - int t = 0; + int cv_index = 0; for (i = control_points_list.begin(); i != control_points_list.end(); ++i) { double w = (*r); - curve->SetCV(t, ON_4dPoint((*i)->X() * LocalUnits::length * w, (*i)->Y() * LocalUnits::length * w, (*i)->Z() * LocalUnits::length * w, w)); - t++; + curve->SetCV(cv_index, ON_4dPoint((*i)->X() * LocalUnits::length * w, (*i)->Y() * LocalUnits::length * w, (*i)->Z() * LocalUnits::length * w, w)); + cv_index++; r++; } @@ -369,11 +369,11 @@ LIST_OF_POINTS::iterator i; LIST_OF_REALS::iterator r = weights_data.begin(); - int t = 0; + int cv_index = 0; for (i = control_points_list.begin(); i != control_points_list.end(); ++i) { double w = (*r); - curve->SetCV(t, ON_4dPoint((*i)->X() * LocalUnits::length * w, (*i)->Y() * LocalUnits::length * w, (*i)->Z() * LocalUnits::length * w, w)); - t++; + curve->SetCV(cv_index, ON_4dPoint((*i)->X() * LocalUnits::length * w, (*i)->Y() * LocalUnits::length * w, (*i)->Z() * LocalUnits::length * w, w)); + cv_index++; r++; } @@ -390,7 +390,7 @@ return true; if (!RationalBSplineCurve::LoadONBrep(brep)) { - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << " id: " << id << std::endl; return false; } return true; @@ -404,7 +404,7 @@ return true; if (!RationalBSplineCurve::LoadONBrep(brep)) { - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << " id: " << id << std::endl; return false; } return true; @@ -418,7 +418,7 @@ return true; if (!BSplineCurve::LoadONBrep(brep)) { - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << " id: " << id << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << " id: " << id << std::endl; return false; } return true; @@ -433,7 +433,7 @@ { //TODO: add bezier surface //ON_BezierSurface* surf = ON_BezierSurface::New(3, false, u_degree+1, v_degree+1); - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } @@ -482,9 +482,9 @@ int u = 0; for (i = control_points_list->begin(); i != control_points_list->end(); ++i) { LIST_OF_POINTS::iterator j; - LIST_OF_POINTS *p = *i; + LIST_OF_POINTS *pnts = *i; int v = 0; - for (j = p->begin(); j != p->end(); ++j) { + for (j = pnts->begin(); j != pnts->end(); ++j) { surf->SetCV(u, v, ON_3dPoint((*j)->X() * LocalUnits::length, (*j)->Y() * LocalUnits::length, (*j)->Z() * LocalUnits::length)); v++; } @@ -567,8 +567,8 @@ LIST_OF_INTEGERS::iterator n = m; n++; - int multiplicity = (*m); - double knot_value = (*r); + multiplicity = (*m); + knot_value = (*r); if (n == v_multiplicities.end() && (multiplicity < v_degree) && (knot_value > 1.0)) { break; @@ -631,7 +631,7 @@ RationalBezierSurface::LoadONBrep(ON_Brep *brep) { //TODO: add rational bezier surface - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not implemented for " << entityname << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return false; } @@ -682,12 +682,12 @@ int u = 0; for (i = control_points_list->begin(); i != control_points_list->end(); ++i) { LIST_OF_POINTS::iterator j; - LIST_OF_POINTS *p = *i; + LIST_OF_POINTS *pnts = *i; r = (*w)->begin(); int v = 0; - for (j = p->begin(); j != p->end(); ++j, r++, v++) { - double w = (*r); - surf->SetCV(u, v, ON_4dPoint((*j)->X() * LocalUnits::length * w, (*j)->Y() * LocalUnits::length * w, (*j)->Z() * LocalUnits::length * w, w)); + for (j = pnts->begin(); j != pnts->end(); ++j, r++, v++) { + double weight = (*r); + surf->SetCV(u, v, ON_4dPoint((*j)->X() * LocalUnits::length * weight, (*j)->Y() * LocalUnits::length * weight, (*j)->Z() * LocalUnits::length * weight, weight)); } u++; w++; @@ -752,8 +752,8 @@ r = (*w)->begin(); int v = 0; for (j = p->begin(); j != p->end(); ++j, r++, v++) { - double w = (*r); - surf->SetCV(u, v, ON_4dPoint((*j)->X() * LocalUnits::length * w, (*j)->Y() * LocalUnits::length * w, (*j)->Z() * LocalUnits::length * w, w)); + double weight = (*r); + surf->SetCV(u, v, ON_4dPoint((*j)->X() * LocalUnits::length * weight, (*j)->Y() * LocalUnits::length * weight, (*j)->Z() * LocalUnits::length * weight, weight)); } u++; w++; @@ -873,10 +873,10 @@ LIST_OF_POINTS::iterator i = control_points_list.begin(); CartesianPoint *cp = (*i); while ((++i) != control_points_list.end()) { - ON_3dPoint start(cp->X() * LocalUnits::length, cp->Y() * LocalUnits::length, cp->Z() * LocalUnits::length); + ON_3dPoint start_point(cp->X() * LocalUnits::length, cp->Y() * LocalUnits::length, cp->Z() * LocalUnits::length); cp = (*i); - ON_3dPoint end(cp->X() * LocalUnits::length, cp->Y() * LocalUnits::length, cp->Z() * LocalUnits::length); - ON_LineCurve* line = new ON_LineCurve(ON_3dPoint(start), ON_3dPoint(end)); + ON_3dPoint end_point(cp->X() * LocalUnits::length, cp->Y() * LocalUnits::length, cp->Z() * LocalUnits::length); + ON_LineCurve* line = new ON_LineCurve(ON_3dPoint(start_point), ON_3dPoint(end_point)); brep->m_C3.Append(line); } } else if (num_control_points > 2) { @@ -1086,6 +1086,10 @@ ON_TextLog tl; LIST_OF_ORIENTED_EDGES::iterator i; + if ((false) && (id == 29429)) { + std::cerr << "Debug:LoadONBrep for Path:" << id << std::endl; + } + for (i = edge_list.begin(); i != edge_list.end(); i++) { if (!(*i)->LoadONBrep(brep)) { std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; @@ -1172,7 +1176,7 @@ ON_BoundingBox bb = curve->BoundingBox(); bool orientWithCurve = (*i)->OrientWithEdge(); - if ((true) && (id == 34193)) { + if ((false) && (id == 34193)) { std::cerr << "Debug:LoadONTrimmingCurves for Path:" << id << std::endl; } data = pullback_samples(st, curve); @@ -1263,13 +1267,13 @@ c2d->GetNurbForm(nurbs_curve); std::cerr << "Num_knots - " << nurbs_curve.KnotCount() << std::endl; std::cerr << "CV count - " << nurbs_curve.CVCount() << std::endl; - for (int i = 0; i < nurbs_curve.KnotCount(); i++) { - std::cerr << "Knot[" << i << "] - " << nurbs_curve.Knot(i) << std::endl; + for (int knot_index = 0; knot_index < nurbs_curve.KnotCount(); knot_index++) { + std::cerr << "Knot[" << knot_index << "] - " << nurbs_curve.Knot(knot_index) << std::endl; } - for (int i = 0; i < nurbs_curve.CVCount(); i++) { + for (int cv_index = 0; cv_index < nurbs_curve.CVCount(); cv_index++) { ON_3dPoint p; - nurbs_curve.GetCV(i, p); - std::cerr << "CV[" << i << "] - " << p.x << ", " << p.y << std::endl; + nurbs_curve.GetCV(cv_index, p); + std::cerr << "CV[" << cv_index << "] - " << p.x << ", " << p.y << std::endl; } } } @@ -1307,9 +1311,9 @@ iso = ON_Surface::W_iso; } - ON_Curve* c2d = new ON_LineCurve(end_current, start_next); + ON_Curve* sing_c2d = new ON_LineCurve(end_current, start_next); trimCurve = brep->m_C2.Count(); - brep->m_C2.Append(c2d); + brep->m_C2.Append(sing_c2d); int vi; if (data->order_reversed) @@ -1539,13 +1543,13 @@ void -Circle::SetParameterTrim(double start, double end) +Circle::SetParameterTrim(double start_param, double end_param) { double startpoint[3]; double endpoint[3]; - t = start * LocalUnits::planeangle; - s = end * LocalUnits::planeangle; + t = start_param * LocalUnits::planeangle; + s = end_param * LocalUnits::planeangle; if (s < t) { t = t - 2 * ON_PI; @@ -1610,7 +1614,7 @@ pnt1 = pnt1 * LocalUnits::length; pnt2 = pnt2 * LocalUnits::length; } else { - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not endpoints for specified for curve " << entityname << std::endl; return false; } @@ -1625,17 +1629,17 @@ ON_3dPoint PX; double xdot = xaxis * v0; double ydot = yaxis * v0; - double t = atan2(ydot, xdot); + double t_theta = atan2(ydot,xdot); xdot = xaxis * v2; ydot = yaxis * v2; - double s = atan2(ydot, xdot); + double s_theta = atan2(ydot,xdot); - if (s < t) - s = s + 2.0*ON_PI; + if ( s_theta < t_theta ) + s_theta = s_theta + 2.0*ON_PI; - double theta = s - t; + double theta = s_theta - t_theta; int narcs = 1; if (theta < ON_PI/2.0) { @@ -1650,13 +1654,13 @@ double dtheta = theta / narcs; double w = cos(dtheta/2.0); ON_3dPointArray cpts(2*narcs + 1); - double angle = t; + double angle = t_theta; double W[2*narcs + 1]; ON_3dPoint P0, P1, P2, PM, PT; ON_3dVector T0, T2; P0 = PB; - T0 = -sin(t)*xaxis + cos(t)*yaxis; + T0 = -sin(t_theta)*xaxis + cos(t_theta)*yaxis; for (int i=0; i < narcs; i++) { PX = center + r * cos(angle + dtheta/2.0) * xaxis + r * sin(angle + dtheta/2.0) * yaxis; @@ -1710,8 +1714,8 @@ } // insert the control points for (int i = 0; i < n; i++) { - ON_3dPoint p = cpts[i]; - c->SetCV(i, p); + ON_3dPoint pnt = cpts[i]; + c->SetCV(i, pnt); c->SetWeight(i, W[i]); } @@ -1722,13 +1726,13 @@ void -Ellipse::SetParameterTrim(double start, double end) +Ellipse::SetParameterTrim(double start_param, double end_param) { double startpoint[3]; double endpoint[3]; - t = start * LocalUnits::planeangle; - s = end * LocalUnits::planeangle; + t = start_param * LocalUnits::planeangle; + s = end_param * LocalUnits::planeangle; if (s < t) { t = t - 2 * ON_PI; @@ -1847,7 +1851,7 @@ t = tmp; } } else { - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not endpoints for specified for curve " << entityname << std::endl; return false; } double yt = b * sin(t); @@ -1934,13 +1938,13 @@ void -Hyperbola::SetParameterTrim(double start, double end) +Hyperbola::SetParameterTrim(double start_param, double end_param) { double startpoint[3]; double endpoint[3]; - t = start; - s = end; + t = start_param; + s = end_param; ON_3dPoint origin = GetOrigin(); ON_3dVector norm = GetNormal(); @@ -2019,7 +2023,7 @@ pnt1 = start->Point3d(); pnt2 = end->Point3d(); } else { - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not endpoints for specified for curve " << entityname << std::endl; return false; } @@ -2097,13 +2101,13 @@ void -Parabola::SetParameterTrim(double start, double end) +Parabola::SetParameterTrim(double start_param, double end_param) { double startpoint[3]; double endpoint[3]; - t = start; - s = end; + t = start_param; + s = end_param; ON_3dPoint origin = GetOrigin(); ON_3dVector xaxis = GetXAxis(); @@ -2174,7 +2178,7 @@ pnt1 = start->Point3d(); pnt2 = end->Point3d(); } else { - std::cerr << "Error: ::LoadONBrep(ON_Brep *brep) not endpoints for specified for curve " << entityname << std::endl; + std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not endpoints for specified for curve " << entityname << std::endl; return false; } Modified: brlcad/trunk/src/conv/step/OrientedEdge.cpp =================================================================== --- brlcad/trunk/src/conv/step/OrientedEdge.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/OrientedEdge.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -40,9 +40,9 @@ edge_element = NULL; } -OrientedEdge::OrientedEdge(STEPWrapper *sw,int STEPid) { +OrientedEdge::OrientedEdge(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; edge_element = NULL; } @@ -57,7 +57,7 @@ if ( !Edge::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Curve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Curve." << std::endl; return false; } @@ -79,7 +79,7 @@ edge_end = edge_element->GetEdgeStart(); } } else { - cerr << CLASSNAME << ": Error loading entity attribute 'edge_element'." << endl; + std::cerr << CLASSNAME << ": Error loading entity attribute 'edge_element'." << std::endl; return false; } } @@ -89,13 +89,13 @@ void OrientedEdge::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "edge_element:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "edge_element:" << std::endl; edge_element->Print(level+1); - TAB(level+1); cout << "orientation:" << step->getBooleanString((SCLBOOL_H(Boolean))orientation) << endl; + TAB(level+1); std::cout << "orientation:" << step->getBooleanString((SCLBOOL_H(Boolean))orientation) << std::endl; } @@ -108,7 +108,7 @@ Factory::AddObject(object); if (!object->Load(sw, sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/OrientedEdge.h =================================================================== --- brlcad/trunk/src/conv/step/OrientedEdge.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/OrientedEdge.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -44,7 +44,7 @@ public: OrientedEdge(); virtual ~OrientedEdge(); - OrientedEdge(STEPWrapper *sw,int STEPid); + OrientedEdge(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual bool LoadONBrep(ON_Brep *brep); bool OrientWithEdge(); Modified: brlcad/trunk/src/conv/step/PCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/PCurve.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/PCurve.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -42,9 +42,9 @@ reference_to_curve = NULL; } -PCurve::PCurve(STEPWrapper *sw,int STEPid) { +PCurve::PCurve(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; basis_surface = NULL; reference_to_curve = NULL; } @@ -60,7 +60,7 @@ id = sse->STEPfile_id; if ( !Curve::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Curve." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Curve." << std::endl; return false; } @@ -74,8 +74,8 @@ if (entity) { basis_surface = dynamic_cast<Surface *>(Factory::CreateObject(sw, entity)); // CreateSurfaceObject(sw, entity)); } else { - cerr << CLASSNAME - << ": Error loading entity attribute 'basis_curve'" << endl; + std::cerr << CLASSNAME + << ": Error loading entity attribute 'basis_curve'" << std::endl; return false; } } @@ -85,7 +85,7 @@ if (entity) { reference_to_curve = (DefinitionalRepresentation*) Factory::CreateObject(sw, entity); } else { - cerr << CLASSNAME << ": Error loading entity attribute 'reference_to_curve'" << endl; + std::cerr << CLASSNAME << ": Error loading entity attribute 'reference_to_curve'" << std::endl; return false; } } @@ -96,26 +96,26 @@ const double * PCurve::PointAtEnd() { //TODO: complete pcurve support - cerr << CLASSNAME << ": Error: virtual function PointAtEnd() not implemented for this type of curve."; + std::cerr << CLASSNAME << ": Error: virtual function PointAtEnd() not implemented for this type of curve."; return NULL; } const double * PCurve::PointAtStart() { //TODO: complete pcurve support - cerr << CLASSNAME << ": Error: virtual function PointAtStart() not implemented for this type of curve."; + std::cerr << CLASSNAME << ": Error: virtual function PointAtStart() not implemented for this type of curve."; return NULL; } void PCurve::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "basis_surface:" << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "basis_surface:" << std::endl; basis_surface->Print(level+1); - TAB(level+1); cout << "reference_to_curve:" << endl; + TAB(level+1); std::cout << "reference_to_curve:" << std::endl; reference_to_curve->Print(level+1); } STEPEntity * @@ -127,7 +127,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/PCurve.h =================================================================== --- brlcad/trunk/src/conv/step/PCurve.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/PCurve.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -43,7 +43,7 @@ public: PCurve(); virtual ~PCurve(); - PCurve(STEPWrapper *sw,int STEPid); + PCurve(STEPWrapper *sw,int step_id); virtual curve_type CurveType() { return PCURVE; }; bool Load(STEPWrapper *sw,SCLP23(Application_instance) *sse); virtual const double *PointAtEnd(); Modified: brlcad/trunk/src/conv/step/PCurveOrSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/PCurveOrSurface.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/PCurveOrSurface.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -51,9 +51,9 @@ surface = NULL; } -PCurveOrSurface::PCurveOrSurface(STEPWrapper *sw,int STEPid) { +PCurveOrSurface::PCurveOrSurface(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; pcurve = NULL; surface = NULL; } @@ -67,7 +67,7 @@ PCurveOrSurface::Load(STEPWrapper *sw,SCLP23(Select) *sse) { step=sw; - cout << sse->UnderlyingTypeName() << endl; + std::cout << sse->UnderlyingTypeName() << std::endl; SdaiPcurve_or_surface *v = (SdaiPcurve_or_surface *)sse; if ( v->IsPcurve() ) { @@ -85,12 +85,12 @@ void PCurveOrSurface::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << endl; + TAB(level); std::cout << CLASSNAME << ":" << std::endl; if (type == PCURVE) { - TAB(level); cout << "Type:" << pcurve_or_surface_type_names[type] << " Value:" << endl; + TAB(level); std::cout << "Type:" << pcurve_or_surface_type_names[type] << " Value:" << std::endl; pcurve->Print(level+1); } else if (type == SURFACE) { - TAB(level); cout << "Type:" << pcurve_or_surface_type_names[type] << " Value:" << endl; + TAB(level); std::cout << "Type:" << pcurve_or_surface_type_names[type] << " Value:" << std::endl; surface->Print(level+1); } } @@ -103,7 +103,7 @@ Factory::AddObject(object); if (!object->Load(sw, (SCLP23(Select) *)sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/PCurveOrSurface.h =================================================================== --- brlcad/trunk/src/conv/step/PCurveOrSurface.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/PCurveOrSurface.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -49,7 +49,7 @@ public: PCurveOrSurface(); virtual ~PCurveOrSurface(); - PCurveOrSurface(STEPWrapper *sw,int STEPid); + PCurveOrSurface(STEPWrapper *sw,int step_id); bool Load(STEPWrapper *sw,SCLP23(Select) *sse); virtual void Print(int level); Modified: brlcad/trunk/src/conv/step/Parabola.cpp =================================================================== --- brlcad/trunk/src/conv/step/Parabola.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/Parabola.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -38,9 +38,9 @@ id = 0; } -Parabola::Parabola(STEPWrapper *sw,int STEPid) { +Parabola::Parabola(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } Parabola::~Parabola() { @@ -52,7 +52,7 @@ id = sse->STEPfile_id; if ( !Conic::Load(step,sse) ) { - cout << CLASSNAME << ":Error loading base class ::Conic." << endl; + std::cout << CLASSNAME << ":Error loading base class ::Conic." << std::endl; return false; } @@ -67,13 +67,13 @@ void Parabola::Print(int level) { - TAB(level); cout << CLASSNAME << ":" << name << "("; - cout << "ID:" << STEPid() << ")" << endl; + TAB(level); std::cout << CLASSNAME << ":" << name << "("; + std::cout << "ID:" << STEPid() << ")" << std::endl; - TAB(level); cout << "Attributes:" << endl; - TAB(level+1); cout << "focal_dist:" << focal_dist << endl; + TAB(level); std::cout << "Attributes:" << std::endl; + TAB(level+1); std::cout << "focal_dist:" << focal_dist << std::endl; - TAB(level); cout << "Inherited Attributes:" << endl; + TAB(level); std::cout << "Inherited Attributes:" << std::endl; Conic::Print(level+1); } STEPEntity * @@ -85,7 +85,7 @@ Factory::AddObject(object); if (!object->Load(sw,sse)) { - cerr << CLASSNAME << ":Error loading class in ::Create() method." << endl; + std::cerr << CLASSNAME << ":Error loading class in ::Create() method." << std::endl; delete object; return NULL; } Modified: brlcad/trunk/src/conv/step/Parabola.h =================================================================== --- brlcad/trunk/src/conv/step/Parabola.h 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/Parabola.h 2009-12-29 12:31:35 UTC (rev 37059) @@ -37,7 +37,7 @@ double focal_dist; Parabola(); - Parabola(STEPWrapper *sw,int STEPid); + Parabola(STEPWrapper *sw,int step_id); public: virtual ~Parabola(); Modified: brlcad/trunk/src/conv/step/ParametricRepresentationContext.cpp =================================================================== --- brlcad/trunk/src/conv/step/ParametricRepresentationContext.cpp 2009-12-29 12:29:07 UTC (rev 37058) +++ brlcad/trunk/src/conv/step/ParametricRepresentationContext.cpp 2009-12-29 12:31:35 UTC (rev 37059) @@ -38,9 +38,9 @@ id = 0; } -ParametricRepresentationContext::ParametricRepresentationContext(STEPWrapper *sw,int STEPid) { +ParametricRepresentationContext::ParametricRepresentationContext(STEPWrapper *sw,int step_id) { step = sw; - id = STEPid; + id = step_id; } ParametricRepresentationContext::~ParametricRepresentationContext() { @@ -53,7 +53,7 @@ // load base class attributes if ( !RepresentationContext::Load(sw,sse) ) { - cout << CLASSNAME << ":Error loading base class ::RepresentationContext." << endl; + std::cout << CLASSNAME << ":Error loading base class ::RepresentationContext." ... [truncated message content] |
From: <br...@us...> - 2009-12-29 21:45:56
|
Revision: 37066 http://brlcad.svn.sourceforge.net/brlcad/?rev=37066&view=rev Author: brlcad Date: 2009-12-29 21:45:46 +0000 (Tue, 29 Dec 2009) Log Message: ----------- update a few more overlooked iostreamers to be std:: namespace scoped. Modified Paths: -------------- brlcad/trunk/src/conv/step/Axis2Placement3D.cpp brlcad/trunk/src/conv/step/Curve.cpp brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.cc brlcad/trunk/src/conv/step/Vector.cpp Modified: brlcad/trunk/src/conv/step/Axis2Placement3D.cpp =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement3D.cpp 2009-12-29 17:29:03 UTC (rev 37065) +++ brlcad/trunk/src/conv/step/Axis2Placement3D.cpp 2009-12-29 21:45:46 UTC (rev 37066) @@ -274,7 +274,7 @@ Axis2Placement3D::LoadONBrep(ON_Brep *brep) { //TODO: check other axis2placement3d usage notice being loaded from advanced brep in some instances - //cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; + //std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; return true; } Modified: brlcad/trunk/src/conv/step/Curve.cpp =================================================================== --- brlcad/trunk/src/conv/step/Curve.cpp 2009-12-29 17:29:03 UTC (rev 37065) +++ brlcad/trunk/src/conv/step/Curve.cpp 2009-12-29 21:45:46 UTC (rev 37066) @@ -79,7 +79,7 @@ } else if ((start != NULL) && (end != NULL)){ //not explicit let's try edge vertices return end->Point3d(); } else { - //cerr << "Error: endpoints not specified for curve " << entityname << std::endl; + //std::cerr << "Error: endpoints not specified for curve " << entityname << std::endl; return NULL; } } @@ -91,7 +91,7 @@ } else if ((start != NULL) && (end != NULL)){ //not explicit let's try edge vertices return start->Point3d(); } else { - //cerr << "Error: endpoints not specified for curve " << entityname << std::endl; + //std::cerr << "Error: endpoints not specified for curve " << entityname << std::endl; return NULL; } } Modified: brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.cc =================================================================== --- brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.cc 2009-12-29 17:29:03 UTC (rev 37065) +++ brlcad/trunk/src/conv/step/SdaiCONFIG_CONTROL_DESIGN.cc 2009-12-29 21:45:46 UTC (rev 37066) @@ -1410,11 +1410,11 @@ // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ - cerr << se -> EntityName () << std::endl; + std::cerr << se -> EntityName () << std::endl; #endif return 0; } @@ -1444,7 +1444,7 @@ else if (CurrentUnderlyingType () == config_control_designe_product_definition_relationship) _app_inst -> STEPwrite_reference (out); else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -1458,7 +1458,7 @@ else if (CurrentUnderlyingType() == config_control_designe_product_definition_relationship) return sdaiINSTANCE; else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return (BASE_TYPE)0; @@ -1488,7 +1488,7 @@ out << ")"; } else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -1526,11 +1526,11 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << instances << " " << addFileId << std::endl; +std::cerr << instances << " " << addFileId << std::endl; #endif return severity (); @@ -1543,11 +1543,11 @@ default: // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << str << " " << instances << std::endl; +std::cerr << str << " " << instances << std::endl; #endif return SEVERITY_WARNING; } @@ -1694,7 +1694,7 @@ return ((SdaiProduct_definition_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -1706,7 +1706,7 @@ return ((SdaiProduct_definition_relationship_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -1721,7 +1721,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition_relationship ) // PRODUCT_DEFINITION_RELATIONSHIP return ((SdaiProduct_definition_relationship_ptr) _app_inst) ->related_product_definition_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -1738,7 +1738,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -1749,7 +1749,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition_relationship ) // PRODUCT_DEFINITION_RELATIONSHIP return ((SdaiProduct_definition_relationship_ptr) _app_inst) ->relating_product_definition_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -1766,7 +1766,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -1777,7 +1777,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition_relationship ) // PRODUCT_DEFINITION_RELATIONSHIP return ((SdaiProduct_definition_relationship_ptr) _app_inst) ->name_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -1794,7 +1794,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -1805,7 +1805,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition ) // PRODUCT_DEFINITION return ((SdaiProduct_definition_ptr) _app_inst) ->frame_of_reference_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -1822,7 +1822,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -1833,7 +1833,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition ) // PRODUCT_DEFINITION return ((SdaiProduct_definition_ptr) _app_inst) ->formation_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -1850,7 +1850,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -1864,7 +1864,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition_relationship ) // PRODUCT_DEFINITION_RELATIONSHIP return ((SdaiProduct_definition_relationship_ptr) _app_inst) ->description_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -1886,7 +1886,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -1900,7 +1900,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition_relationship ) // PRODUCT_DEFINITION_RELATIONSHIP return ((SdaiProduct_definition_relationship_ptr) _app_inst) ->id_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -1922,7 +1922,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -2024,11 +2024,11 @@ // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ - cerr << se -> EntityName () << std::endl; + std::cerr << se -> EntityName () << std::endl; #endif return 0; } @@ -2060,7 +2060,7 @@ else if (CurrentUnderlyingType () == config_control_designe_shape_aspect_relationship) _app_inst -> STEPwrite_reference (out); else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -2076,7 +2076,7 @@ else if (CurrentUnderlyingType() == config_control_designe_shape_aspect_relationship) return sdaiINSTANCE; else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return (BASE_TYPE)0; @@ -2112,7 +2112,7 @@ out << ")"; } else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -2163,11 +2163,11 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << instances << " " << addFileId << std::endl; +std::cerr << instances << " " << addFileId << std::endl; #endif return severity (); @@ -2180,11 +2180,11 @@ default: // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << str << " " << instances << std::endl; +std::cerr << str << " " << instances << std::endl; #endif return SEVERITY_WARNING; } @@ -2350,7 +2350,7 @@ return ((SdaiProduct_definition_shape_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -2362,7 +2362,7 @@ return ((SdaiShape_aspect_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -2374,7 +2374,7 @@ return ((SdaiShape_aspect_relationship_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -2389,7 +2389,7 @@ if( CurrentUnderlyingType () == config_control_designe_shape_aspect_relationship ) // SHAPE_ASPECT_RELATIONSHIP return ((SdaiShape_aspect_relationship_ptr) _app_inst) ->related_shape_aspect_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -2406,7 +2406,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -2417,7 +2417,7 @@ if( CurrentUnderlyingType () == config_control_designe_shape_aspect_relationship ) // SHAPE_ASPECT_RELATIONSHIP return ((SdaiShape_aspect_relationship_ptr) _app_inst) ->relating_shape_aspect_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -2434,7 +2434,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -2445,7 +2445,7 @@ if( CurrentUnderlyingType () == config_control_designe_shape_aspect ) // SHAPE_ASPECT return ((SdaiShape_aspect_ptr) _app_inst) ->product_definitional_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return (SCLLOG(Logical)) 0; } @@ -2462,7 +2462,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -2473,7 +2473,7 @@ if( CurrentUnderlyingType () == config_control_designe_shape_aspect ) // SHAPE_ASPECT return ((SdaiShape_aspect_ptr) _app_inst) ->of_shape_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -2490,7 +2490,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -2501,7 +2501,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition_shape ) // PRODUCT_DEFINITION_SHAPE return ((SdaiProduct_definition_shape_ptr) _app_inst) ->definition_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -2518,7 +2518,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -2535,7 +2535,7 @@ if( CurrentUnderlyingType () == config_control_designe_shape_aspect_relationship ) // SHAPE_ASPECT_RELATIONSHIP return ((SdaiShape_aspect_relationship_ptr) _app_inst) ->description_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -2562,7 +2562,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -2579,7 +2579,7 @@ if( CurrentUnderlyingType () == config_control_designe_shape_aspect_relationship ) // SHAPE_ASPECT_RELATIONSHIP return ((SdaiShape_aspect_relationship_ptr) _app_inst) ->name_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -2606,7 +2606,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -2723,11 +2723,11 @@ // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ - cerr << se -> EntityName () << std::endl; + std::cerr << se -> EntityName () << std::endl; #endif return 0; } @@ -2757,7 +2757,7 @@ else if (CurrentUnderlyingType () == config_control_designt_shape_definition) _sdaishape_definition.STEPwrite (out, currSch); else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -2771,7 +2771,7 @@ else if (CurrentUnderlyingType() == config_control_designt_shape_definition) return _sdaishape_definition.ValueType(); else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return (BASE_TYPE)0; @@ -2801,7 +2801,7 @@ out << ")"; } else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -2821,11 +2821,11 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << instances << " " << addFileId << std::endl; +std::cerr << instances << " " << addFileId << std::endl; #endif return severity (); @@ -2838,11 +2838,11 @@ default: // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << str << " " << instances << std::endl; +std::cerr << str << " " << instances << std::endl; #endif return SEVERITY_WARNING; } @@ -2998,7 +2998,7 @@ Error( "Underlying type is not SdaiCharacterized_product_definition_ptr" ); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return 0; @@ -3013,7 +3013,7 @@ Error( "Underlying type is not SdaiShape_definition_ptr" ); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return 0; @@ -3107,11 +3107,11 @@ // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ - cerr << se -> EntityName () << std::endl; + std::cerr << se -> EntityName () << std::endl; #endif return 0; } @@ -3139,7 +3139,7 @@ if (CurrentUnderlyingType () == config_control_designe_product_definition_formation) _app_inst -> STEPwrite_reference (out); else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -3151,7 +3151,7 @@ if (CurrentUnderlyingType() == config_control_designe_product_definition_formation) return sdaiINSTANCE; else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return (BASE_TYPE)0; @@ -3175,7 +3175,7 @@ out << ")"; } else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -3200,11 +3200,11 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << instances << " " << addFileId << std::endl; +std::cerr << instances << " " << addFileId << std::endl; #endif return severity (); @@ -3217,11 +3217,11 @@ default: // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << str << " " << instances << std::endl; +std::cerr << str << " " << instances << std::endl; #endif return SEVERITY_WARNING; } @@ -3349,7 +3349,7 @@ return ((SdaiProduct_definition_formation_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -3364,7 +3364,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition_formation ) // PRODUCT_DEFINITION_FORMATION return ((SdaiProduct_definition_formation_ptr) _app_inst) ->of_product_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -3381,7 +3381,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -3392,7 +3392,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition_formation ) // PRODUCT_DEFINITION_FORMATION return ((SdaiProduct_definition_formation_ptr) _app_inst) ->description_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -3409,7 +3409,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -3420,7 +3420,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition_formation ) // PRODUCT_DEFINITION_FORMATION return ((SdaiProduct_definition_formation_ptr) _app_inst) ->id_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -3437,7 +3437,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -3536,11 +3536,11 @@ // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ - cerr << se -> EntityName () << std::endl; + std::cerr << se -> EntityName () << std::endl; #endif return 0; } @@ -3578,7 +3578,7 @@ else if (CurrentUnderlyingType () == config_control_designe_open_shell) _app_inst -> STEPwrite_reference (out); else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -3600,7 +3600,7 @@ else if (CurrentUnderlyingType() == config_control_designe_open_shell) return sdaiINSTANCE; else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return (BASE_TYPE)0; @@ -3654,7 +3654,7 @@ out << ")"; } else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -3744,11 +3744,11 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << instances << " " << addFileId << std::endl; +std::cerr << instances << " " << addFileId << std::endl; #endif return severity (); @@ -3761,11 +3761,11 @@ default: // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << str << " " << instances << std::endl; +std::cerr << str << " " << instances << std::endl; #endif return SEVERITY_WARNING; } @@ -3988,7 +3988,7 @@ return ((SdaiEdge_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -4000,7 +4000,7 @@ return ((SdaiPath_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -4012,7 +4012,7 @@ return ((SdaiFace_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -4024,7 +4024,7 @@ return ((SdaiFace_bound_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -4036,7 +4036,7 @@ return ((SdaiClosed_shell_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -4048,7 +4048,7 @@ return ((SdaiOpen_shell_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -4066,7 +4066,7 @@ if( CurrentUnderlyingType () == config_control_designe_open_shell ) // OPEN_SHELL return ((SdaiOpen_shell_ptr) _app_inst) ->cfs_faces_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -4088,7 +4088,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -4099,7 +4099,7 @@ if( CurrentUnderlyingType () == config_control_designe_face_bound ) // FACE_BOUND return ((SdaiFace_bound_ptr) _app_inst) ->orientation_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return (SCLBOOL(Boolean)) 0; } @@ -4116,7 +4116,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -4127,7 +4127,7 @@ if( CurrentUnderlyingType () == config_control_designe_face_bound ) // FACE_BOUND return ((SdaiFace_bound_ptr) _app_inst) ->bound_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -4144,7 +4144,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -4155,7 +4155,7 @@ if( CurrentUnderlyingType () == config_control_designe_face ) // FACE return ((SdaiFace_ptr) _app_inst) ->bounds_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -4172,7 +4172,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -4183,7 +4183,7 @@ if( CurrentUnderlyingType () == config_control_designe_path ) // PATH return ((SdaiPath_ptr) _app_inst) ->edge_list_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -4200,7 +4200,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -4211,7 +4211,7 @@ if( CurrentUnderlyingType () == config_control_designe_edge ) // EDGE return ((SdaiEdge_ptr) _app_inst) ->edge_end_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -4228,7 +4228,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -4239,7 +4239,7 @@ if( CurrentUnderlyingType () == config_control_designe_edge ) // EDGE return ((SdaiEdge_ptr) _app_inst) ->edge_start_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -4256,7 +4256,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -4282,7 +4282,7 @@ if( CurrentUnderlyingType () == config_control_designe_open_shell ) // OPEN_SHELL return ((SdaiOpen_shell_ptr) _app_inst) ->name_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -4324,7 +4324,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -4504,11 +4504,11 @@ // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ - cerr << se -> EntityName () << std::endl; + std::cerr << se -> EntityName () << std::endl; #endif return 0; } @@ -4538,7 +4538,7 @@ else if (CurrentUnderlyingType () == config_control_designe_axis2_placement_3d) _app_inst -> STEPwrite_reference (out); else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -4552,7 +4552,7 @@ else if (CurrentUnderlyingType() == config_control_designe_axis2_placement_3d) return sdaiINSTANCE; else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return (BASE_TYPE)0; @@ -4582,7 +4582,7 @@ out << ")"; } else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -4620,11 +4620,11 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << instances << " " << addFileId << std::endl; +std::cerr << instances << " " << addFileId << std::endl; #endif return severity (); @@ -4637,11 +4637,11 @@ default: // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << str << " " << instances << std::endl; +std::cerr << str << " " << instances << std::endl; #endif return SEVERITY_WARNING; } @@ -4788,7 +4788,7 @@ return ((SdaiAxis2_placement_2d_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -4800,7 +4800,7 @@ return ((SdaiAxis2_placement_3d_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -4815,7 +4815,7 @@ if( CurrentUnderlyingType () == config_control_designe_axis2_placement_3d ) // AXIS2_PLACEMENT_3D return ((SdaiAxis2_placement_3d_ptr) _app_inst) ->axis_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -4832,7 +4832,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -4846,7 +4846,7 @@ if( CurrentUnderlyingType () == config_control_designe_axis2_placement_3d ) // AXIS2_PLACEMENT_3D return ((SdaiAxis2_placement_3d_ptr) _app_inst) ->ref_direction_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -4868,7 +4868,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -4882,7 +4882,7 @@ if( CurrentUnderlyingType () == config_control_designe_axis2_placement_3d ) // AXIS2_PLACEMENT_3D return ((SdaiAxis2_placement_3d_ptr) _app_inst) ->location_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -4904,7 +4904,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -4918,7 +4918,7 @@ if( CurrentUnderlyingType () == config_control_designe_axis2_placement_3d ) // AXIS2_PLACEMENT_3D return ((SdaiAxis2_placement_3d_ptr) _app_inst) ->name_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -4940,7 +4940,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -5036,11 +5036,11 @@ // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ - cerr << se -> EntityName () << std::endl; + std::cerr << se -> EntityName () << std::endl; #endif return 0; } @@ -5070,7 +5070,7 @@ else if (CurrentUnderlyingType () == config_control_designe_shape_aspect) _app_inst -> STEPwrite_reference (out); else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -5084,7 +5084,7 @@ else if (CurrentUnderlyingType() == config_control_designe_shape_aspect) return sdaiINSTANCE; else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return (BASE_TYPE)0; @@ -5114,7 +5114,7 @@ out << ")"; } else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -5152,11 +5152,11 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << instances << " " << addFileId << std::endl; +std::cerr << instances << " " << addFileId << std::endl; #endif return severity (); @@ -5169,11 +5169,11 @@ default: // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << str << " " << instances << std::endl; +std::cerr << str << " " << instances << std::endl; #endif return SEVERITY_WARNING; } @@ -5320,7 +5320,7 @@ return ((SdaiProduct_definition_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -5332,7 +5332,7 @@ return ((SdaiShape_aspect_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -5347,7 +5347,7 @@ if( CurrentUnderlyingType () == config_control_designe_shape_aspect ) // SHAPE_ASPECT return ((SdaiShape_aspect_ptr) _app_inst) ->product_definitional_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return (SCLLOG(Logical)) 0; } @@ -5364,7 +5364,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -5375,7 +5375,7 @@ if( CurrentUnderlyingType () == config_control_designe_shape_aspect ) // SHAPE_ASPECT return ((SdaiShape_aspect_ptr) _app_inst) ->of_shape_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -5392,7 +5392,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -5403,7 +5403,7 @@ if( CurrentUnderlyingType () == config_control_designe_shape_aspect ) // SHAPE_ASPECT return ((SdaiShape_aspect_ptr) _app_inst) ->name_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -5420,7 +5420,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -5431,7 +5431,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition ) // PRODUCT_DEFINITION return ((SdaiProduct_definition_ptr) _app_inst) ->frame_of_reference_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -5448,7 +5448,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -5459,7 +5459,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition ) // PRODUCT_DEFINITION return ((SdaiProduct_definition_ptr) _app_inst) ->formation_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -5476,7 +5476,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -5490,7 +5490,7 @@ if( CurrentUnderlyingType () == config_control_designe_shape_aspect ) // SHAPE_ASPECT return ((SdaiShape_aspect_ptr) _app_inst) ->description_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -5512,7 +5512,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -5523,7 +5523,7 @@ if( CurrentUnderlyingType () == config_control_designe_product_definition ) // PRODUCT_DEFINITION return ((SdaiProduct_definition_ptr) _app_inst) ->id_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -5540,7 +5540,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -5624,11 +5624,11 @@ // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ - cerr << se -> EntityName () << std::endl; + std::cerr << se -> EntityName () << std::endl; #endif return 0; } @@ -5678,7 +5678,7 @@ else if (CurrentUnderlyingType () == config_control_designt_count_measure) WriteReal(_real,out); else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -5712,7 +5712,7 @@ else if (CurrentUnderlyingType() == config_control_designt_count_measure) return sdaiNUMBER; else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return (BASE_TYPE)0; @@ -5802,7 +5802,7 @@ out << ")"; } else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -5862,11 +5862,11 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << instances << " " << addFileId << std::endl; +std::cerr << instances << " " << addFileId << std::endl; #endif return severity (); @@ -5881,11 +5881,11 @@ default: // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << str << " " << instances << std::endl; +std::cerr << str << " " << instances << std::endl; #endif return SEVERITY_WARNING; } @@ -6030,7 +6030,7 @@ Error( "Underlying type is not SdaiDescriptive_measure" ); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return 0; @@ -6065,7 +6065,7 @@ Error( "Underlying type is not SCLP23(Real)" ); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return (SCLP23(Real))0; @@ -6310,11 +6310,11 @@ // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ - cerr << se -> EntityName () << std::endl; + std::cerr << se -> EntityName () << std::endl; #endif return 0; } @@ -6346,7 +6346,7 @@ else if (CurrentUnderlyingType () == config_control_designe_person_and_organization) _app_inst -> STEPwrite_reference (out); else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -6362,7 +6362,7 @@ else if (CurrentUnderlyingType() == config_control_designe_person_and_organization) return sdaiINSTANCE; else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return (BASE_TYPE)0; @@ -6398,7 +6398,7 @@ out << ")"; } else { - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; } return; @@ -6449,11 +6449,11 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << instances << " " << addFileId << std::endl; +std::cerr << instances << " " << addFileId << std::endl; #endif return severity (); @@ -6466,11 +6466,11 @@ default: // should never be here - done in Select class severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); #ifdef __SUNCPLUSPLUS__ -cerr << str << " " << instances << std::endl; +std::cerr << str << " " << instances << std::endl; #endif return SEVERITY_WARNING; } @@ -6636,7 +6636,7 @@ return ((SdaiPerson_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -6648,7 +6648,7 @@ return ((SdaiOrganization_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -6660,7 +6660,7 @@ return ((SdaiPerson_and_organization_ptr) _app_inst); severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); return NULL; @@ -6675,7 +6675,7 @@ if( CurrentUnderlyingType () == config_control_designe_person_and_organization ) // PERSON_AND_ORGANIZATION return ((SdaiPerson_and_organization_ptr) _app_inst) ->the_organization_(); - cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" + std::cerr << __FILE__ << ":" << __LINE__ << ": ERROR in schema library: \n" << _POC_ << "\n\n"; return 0; } @@ -6692,7 +6692,7 @@ } severity( SEVERITY_WARNING ); - cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" + std::cerr << __FILE__ << ":" << __LINE__ << ": WARNING: possible misuse of" << " SELECT TYPE from schema library.\n"; Error( "Mismatch in underlying type." ); } @@ -6703,7 +6703,7 @@ if( CurrentUnderlyingType () == config_control_designe_pers... [truncated message content] |
From: <ind...@us...> - 2010-01-28 12:41:54
|
Revision: 37455 http://brlcad.svn.sourceforge.net/brlcad/?rev=37455&view=rev Author: indianlarry Date: 2010-01-28 12:18:24 +0000 (Thu, 28 Jan 2010) Log Message: ----------- Just update to copyright dates, somehow got skipped. Modified Paths: -------------- brlcad/trunk/src/conv/step/DerivedUnitElement.cpp brlcad/trunk/src/conv/step/DerivedUnitElement.h brlcad/trunk/src/conv/step/DimensionalExponents.cpp brlcad/trunk/src/conv/step/DimensionalExponents.h Modified: brlcad/trunk/src/conv/step/DerivedUnitElement.cpp =================================================================== --- brlcad/trunk/src/conv/step/DerivedUnitElement.cpp 2010-01-28 04:00:17 UTC (rev 37454) +++ brlcad/trunk/src/conv/step/DerivedUnitElement.cpp 2010-01-28 12:18:24 UTC (rev 37455) @@ -1,7 +1,7 @@ /* DerivedUnitElement.cpp * BRL-CAD * - * Copyright (c) 1994-2009 DerivedUnitElemented States Government as represented by + * Copyright (c) 1994-2010 DerivedUnitElemented States Government as represented by * the U.S. Army Research Laboratory. * * This program is free software; you can redistribute it and/or Modified: brlcad/trunk/src/conv/step/DerivedUnitElement.h =================================================================== --- brlcad/trunk/src/conv/step/DerivedUnitElement.h 2010-01-28 04:00:17 UTC (rev 37454) +++ brlcad/trunk/src/conv/step/DerivedUnitElement.h 2010-01-28 12:18:24 UTC (rev 37455) @@ -1,7 +1,7 @@ /* DerivedUnitElement.h * BRL-CAD * - * Copyright (c) 1994-2009 DerivedUnitElemented States Government as represented by + * Copyright (c) 1994-2010 DerivedUnitElemented States Government as represented by * the U.S. Army Research Laboratory. * * This program is free software; you can redistribute it and/or Modified: brlcad/trunk/src/conv/step/DimensionalExponents.cpp =================================================================== --- brlcad/trunk/src/conv/step/DimensionalExponents.cpp 2010-01-28 04:00:17 UTC (rev 37454) +++ brlcad/trunk/src/conv/step/DimensionalExponents.cpp 2010-01-28 12:18:24 UTC (rev 37455) @@ -1,7 +1,7 @@ /* DimensionalExponents.cpp * BRL-CAD * - * Copyright (c) 1994-2009 DimensionalExponentsed States Government as represented by + * Copyright (c) 1994-2010 DimensionalExponentsed States Government as represented by * the U.S. Army Research Laboratory. * * This program is free software; you can redistribute it and/or Modified: brlcad/trunk/src/conv/step/DimensionalExponents.h =================================================================== --- brlcad/trunk/src/conv/step/DimensionalExponents.h 2010-01-28 04:00:17 UTC (rev 37454) +++ brlcad/trunk/src/conv/step/DimensionalExponents.h 2010-01-28 12:18:24 UTC (rev 37455) @@ -1,7 +1,7 @@ /* DimensionalExponent.h * BRL-CAD * - * Copyright (c) 1994-2009 DimensionalExponented States Government as represented by + * Copyright (c) 1994-2010 DimensionalExponented States Government as represented by * the U.S. Army Research Laboratory. * * This program is free software; you can redistribute it and/or This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-10-29 06:36:48
|
Revision: 41167 http://brlcad.svn.sourceforge.net/brlcad/?rev=41167&view=rev Author: brlcad Date: 2010-10-29 06:36:42 +0000 (Fri, 29 Oct 2010) Log Message: ----------- quell warnings, mostly unused. Modified Paths: -------------- brlcad/trunk/src/conv/step/Axis1Placement.cpp brlcad/trunk/src/conv/step/Axis1Placement.h brlcad/trunk/src/conv/step/Axis2Placement3D.cpp brlcad/trunk/src/conv/step/Loop.cpp brlcad/trunk/src/conv/step/MassUnit.cpp brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp brlcad/trunk/src/conv/step/PullbackCurve.cpp brlcad/trunk/src/conv/step/RationalBSplineSurface.cpp Modified: brlcad/trunk/src/conv/step/Axis1Placement.cpp =================================================================== --- brlcad/trunk/src/conv/step/Axis1Placement.cpp 2010-10-29 06:35:31 UTC (rev 41166) +++ brlcad/trunk/src/conv/step/Axis1Placement.cpp 2010-10-29 06:36:42 UTC (rev 41167) @@ -64,7 +64,7 @@ } const double * -Axis1Placement::GetAxis(int i) { +Axis1Placement::GetAxis() { return z; } Modified: brlcad/trunk/src/conv/step/Axis1Placement.h =================================================================== --- brlcad/trunk/src/conv/step/Axis1Placement.h 2010-10-29 06:35:31 UTC (rev 41166) +++ brlcad/trunk/src/conv/step/Axis1Placement.h 2010-10-29 06:36:42 UTC (rev 41167) @@ -46,7 +46,7 @@ Axis1Placement(); virtual ~Axis1Placement(); Axis1Placement(STEPWrapper *sw,int step_id); - const double *GetAxis(int i); + const double *GetAxis(); virtual const double *GetOrigin(); virtual const double *GetNormal(); virtual const double *GetXAxis(); Modified: brlcad/trunk/src/conv/step/Axis2Placement3D.cpp =================================================================== --- brlcad/trunk/src/conv/step/Axis2Placement3D.cpp 2010-10-29 06:35:31 UTC (rev 41166) +++ brlcad/trunk/src/conv/step/Axis2Placement3D.cpp 2010-10-29 06:36:42 UTC (rev 41167) @@ -271,7 +271,7 @@ } bool -Axis2Placement3D::LoadONBrep(ON_Brep *brep) +Axis2Placement3D::LoadONBrep(ON_Brep *UNUSED(brep)) { //TODO: check other axis2placement3d usage notice being loaded from advanced brep in some instances //std::cerr << "Error: ::LoadONBrep(ON_Brep *brep<" << std::hex << brep << ">) not implemented for " << entityname << std::endl; Modified: brlcad/trunk/src/conv/step/Loop.cpp =================================================================== --- brlcad/trunk/src/conv/step/Loop.cpp 2010-10-29 06:35:31 UTC (rev 41166) +++ brlcad/trunk/src/conv/step/Loop.cpp 2010-10-29 06:36:42 UTC (rev 41167) @@ -89,7 +89,7 @@ } ON_BoundingBox * -Loop::GetEdgeBounds(ON_Brep *brep) { +Loop::GetEdgeBounds(ON_Brep *UNUSED(brep)) { return NULL; } Modified: brlcad/trunk/src/conv/step/MassUnit.cpp =================================================================== --- brlcad/trunk/src/conv/step/MassUnit.cpp 2010-10-29 06:35:31 UTC (rev 41166) +++ brlcad/trunk/src/conv/step/MassUnit.cpp 2010-10-29 06:36:42 UTC (rev 41167) @@ -54,8 +54,10 @@ // load base class attributes if ( !NamedUnit::Load(step,sse) ) { - ERROR( CLASSNAME << ":Error loading base class ::Unit." ); - return false; + std::string err = CLASSNAME; + err += ":Error loading base class ::Unit."; + ERROR(err); + return false; } return true; Modified: brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp =================================================================== --- brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2010-10-29 06:35:31 UTC (rev 41166) +++ brlcad/trunk/src/conv/step/OpenNurbsInterfaces.cpp 2010-10-29 06:36:42 UTC (rev 41167) @@ -844,7 +844,7 @@ void -Point::AddVertex(ON_Brep *brep) +Point::AddVertex(ON_Brep *UNUSED(brep)) { std::cerr << "Warning: " << entityname << "::AddVertex() should be overridden by parent class." << std::endl; } @@ -881,6 +881,8 @@ } } else if (num_control_points > 2) { ON_NurbsCurve* c = ON_NurbsCurve::New(3, false, degree + 1, num_control_points); + /* FIXME: do something with c */ + delete c; } else { std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading polyLine." << std::endl; } @@ -927,7 +929,6 @@ std::cerr << "Error: " << entityname << "::LoadONBrep() - Error loading openNURBS brep." << std::endl; return false; } - ON_BrepFace& face = brep->m_F[GetONId()]; cnt++; } return true; @@ -2167,7 +2168,6 @@ double fd = focal_dist * LocalUnits::length; ON_3dPoint focus = center + fd * xaxis; ON_3dPoint directrix = center - fd * xaxis; - double eccentricity = 1.0; // for parabola eccentricity is always 1.0 ON_3dPoint pnt1; ON_3dPoint pnt2; @@ -2462,7 +2462,8 @@ int trimCurve = brep->m_C2.Count(); brep->m_C2.Append(c2d); - ON_BrepTrim& trim = brep->NewSingularTrim(brep->m_V[loop_vertex->GetONId()], loop, iso, trimCurve); + (void)brep->NewSingularTrim(brep->m_V[loop_vertex->GetONId()], loop, iso, trimCurve); + /* FIXME: do something with this trim */ return true; } Modified: brlcad/trunk/src/conv/step/PullbackCurve.cpp =================================================================== --- brlcad/trunk/src/conv/step/PullbackCurve.cpp 2010-10-29 06:35:31 UTC (rev 41166) +++ brlcad/trunk/src/conv/step/PullbackCurve.cpp 2010-10-29 06:36:42 UTC (rev 41167) @@ -111,7 +111,7 @@ void -brep_newton_iterate(const ON_Surface* surf, plane_ray& pr, pt2d_t R, ON_3dVector& su, ON_3dVector& sv, pt2d_t uv, pt2d_t out_uv) +brep_newton_iterate(const ON_Surface* UNUSED(surf), plane_ray& pr, pt2d_t R, ON_3dVector& su, ON_3dVector& sv, pt2d_t uv, pt2d_t out_uv) { mat2d_t jacob = { VDOT(pr.n1, ((fastf_t*)su)), VDOT(pr.n1, ((fastf_t*)sv)), VDOT(pr.n2, ((fastf_t*)su)), VDOT(pr.n2, ((fastf_t*)sv)) }; @@ -748,8 +748,8 @@ ON_Curve* test1_pullback_curve(const brlcad::SurfaceTree* surfacetree, const ON_Curve* curve, - double tolerance, - double flatness) + double UNUSED(tolerance), + double UNUSED(flatness)) { ON_NurbsCurve* orig = curve->NurbsCurve(); bool isRational = false; @@ -1009,7 +1009,7 @@ ON_Curve* -refit_edge(const ON_BrepEdge* edge, double tolerance) +refit_edge(const ON_BrepEdge* edge, double UNUSED(tolerance)) { double edge_tolerance = 0.01; ON_Brep *brep = edge->Brep(); @@ -1971,8 +1971,6 @@ bool check_pullback_data(std::list<PBCData*> &pbcs) { - bool resolvable = true; - bool resolved = false; std::list<PBCData*>::iterator d = pbcs.begin(); //TODO: remove debugging code Modified: brlcad/trunk/src/conv/step/RationalBSplineSurface.cpp =================================================================== --- brlcad/trunk/src/conv/step/RationalBSplineSurface.cpp 2010-10-29 06:35:31 UTC (rev 41166) +++ brlcad/trunk/src/conv/step/RationalBSplineSurface.cpp 2010-10-29 06:36:42 UTC (rev 41167) @@ -67,8 +67,6 @@ // the actual entity and not a complex/supertype parent sse = step->getEntity(sse,ENTITYNAME); - SdaiRational_b_spline_surface *rbs = (SdaiRational_b_spline_surface*)sse; - if (weights_data.empty()) { SCLstring attrval; STEPattribute *attr = step->getAttribute(sse,"weights_data"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |