[brlcad-commits] SF.net SVN: brlcad:[36979] brlcad/trunk/src/conv/step
Open Source Solid Modeling CAD
Brought to you by:
brlcad
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. |